OSDN Git Service
Christopher Tate [Sat, 8 Oct 2016 18:52:36 +0000 (18:52 +0000)]
Merge "Fix job scheduler crash due to uninstall race am:
652c5ad516 am:
1131f280ae" into nyc-mr1-dev-plus-aosp
am:
e6b72a1859
Change-Id: I797b582a91a95cd8df3895009294a69e212a98f8
Christopher Tate [Sat, 8 Oct 2016 18:52:28 +0000 (18:52 +0000)]
Fix job scheduler crash due to uninstall race am:
652c5ad516 am:
1131f280ae
am:
fe83435089
Change-Id: I1701b56c57ac5ac120ab15d7afd70726b783fa53
Hugo Benichi [Sat, 8 Oct 2016 18:50:46 +0000 (18:50 +0000)]
Merge "Merge "Catch runtime exceptions when parsing DHCP packets" into nyc-mr1-dev am:
69544fd74d am:
4b0e3098f2" into nyc-mr1-dev-plus-aosp
am:
8e6fcafd33
Change-Id: I32879a55fcc75f63df751b5ba9a6788474c44dce
Hugo Benichi [Sat, 8 Oct 2016 18:50:39 +0000 (18:50 +0000)]
Merge "Catch runtime exceptions when parsing DHCP packets" into nyc-mr1-dev am:
69544fd74d am:
4b0e3098f2
am:
16e39169e7
Change-Id: I7de1d11d2f5513ad48297b7b17972855f4973f29
Hugo Benichi [Sat, 8 Oct 2016 18:49:02 +0000 (18:49 +0000)]
Merge "Catch runtime exceptions when parsing DHCP packets am:
e0ea7fecd6 am:
c4a13afe92" into nyc-mr1-dev-plus-aosp
am:
2b5905ad0e
Change-Id: I69234ae87a081f2eb8d16bf75f510a4b8fa0725f
Hugo Benichi [Sat, 8 Oct 2016 18:48:55 +0000 (18:48 +0000)]
Catch runtime exceptions when parsing DHCP packets am:
e0ea7fecd6 am:
c4a13afe92
am:
9f713864ca
Change-Id: I41b2576f5e944e4d52160570b60bb53315cb7009
Amanda Kassay [Sat, 8 Oct 2016 18:47:16 +0000 (18:47 +0000)]
Merge "Wear Preview, auto, tv, versions project metadata. b/
31771704 b/
31903798 b/
31773716 am:
fd6846e116 am:
a7e9861112 am:
5aab061303 am:
ad45b14606" into nyc-mr1-dev-plus-aosp
am:
342019d3fe
Change-Id: I72d528485db2c83d6be319a42fddfcce5136f7e0
Amanda Kassay [Sat, 8 Oct 2016 18:47:06 +0000 (18:47 +0000)]
Wear Preview, auto, tv, versions project metadata. b/
31771704 b/
31903798 b/
31773716 am:
fd6846e116 am:
a7e9861112 am:
5aab061303 am:
ad45b14606
am:
8f6d2bfe02
Change-Id: Iec3972d2830ac1c0603e27553e4a51ee9dd91bbb
Bill Yi [Sat, 8 Oct 2016 18:45:09 +0000 (18:45 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
5e6fb1699f -s ours am:
dcc4542c05 -s ours" into nyc-mr1-dev-plus-aosp
am:
11f8c5381a -s ours
Change-Id: I5d97d38e85bce8af7100b4f28720960e9991ee31
Bill Yi [Sat, 8 Oct 2016 18:45:05 +0000 (18:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
5e6fb1699f -s ours am:
dcc4542c05 -s ours
am:
2d2d335631 -s ours
Change-Id: Ib945badfb9d5fc0f218b000279df981ff3b6790b
Bill Yi [Sat, 8 Oct 2016 18:43:30 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE am:
41cf6c32a1 -s ours am:
df10fcf220 -s ours" into nyc-mr1-dev-plus-aosp
am:
0c327cfc0d -s ours
Change-Id: I69deefce0810d5dfc02eb8184bf5123ceea681db
Bill Yi [Sat, 8 Oct 2016 18:43:25 +0000 (18:43 +0000)]
Import translations. DO NOT MERGE am:
41cf6c32a1 -s ours am:
df10fcf220 -s ours
am:
76dbadeb5d -s ours
Change-Id: I5af0c206cd3e54dcee670faccdc7da4b22260a45
Bill Yi [Sat, 8 Oct 2016 18:41:46 +0000 (18:41 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f381889844 -s ours am:
d8ae5393a8 -s ours" into nyc-mr1-dev-plus-aosp
am:
59a9de0479 -s ours
Change-Id: I56eb026e2403bc57d70236ed2d54cd14892b95fc
Bill Yi [Sat, 8 Oct 2016 18:41:39 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f381889844 -s ours am:
d8ae5393a8 -s ours
am:
859d5217c0 -s ours
Change-Id: I30fc516f64978b7777dcaa2898e80a3ecfaa44c3
Bill Yi [Sat, 8 Oct 2016 18:40:08 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE am:
e6327db2af -s ours am:
925f4f35b5 -s ours" into nyc-mr1-dev-plus-aosp
am:
a6216703f0 -s ours
Change-Id: I1d9fa8512af67e696ac8e1abefc0051ce9bf4630
Bill Yi [Sat, 8 Oct 2016 18:40:05 +0000 (18:40 +0000)]
Import translations. DO NOT MERGE am:
e6327db2af -s ours am:
925f4f35b5 -s ours
am:
54e34e9c7e -s ours
Change-Id: Iaf692781a119ab66156c4aea59746bcee16ede4f
Nancy Zheng [Sat, 8 Oct 2016 18:38:30 +0000 (18:38 +0000)]
Merge "Change DEFAULT_BG_LOW_JOB_COUNT to 1 in JobSchedulerService. am:
e39a8a46d9 am:
ef866c3d0f" into nyc-mr1-dev-plus-aosp
am:
2a99707564
Change-Id: I08d870469a0522a6eeb839137db57d3c958b2fc9
Nancy Zheng [Sat, 8 Oct 2016 18:38:20 +0000 (18:38 +0000)]
Change DEFAULT_BG_LOW_JOB_COUNT to 1 in JobSchedulerService. am:
e39a8a46d9 am:
ef866c3d0f
am:
1076354748
Change-Id: Ieb1d31126e2a51912c820d15fff013ece021673d
Tenghui Zhu [Sat, 8 Oct 2016 18:36:37 +0000 (18:36 +0000)]
Merge "Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev am:
8e93abcd6c am:
f8bfc7890f" into nyc-mr1-dev-plus-aosp
am:
9332ab9524
Change-Id: I0ae727ba032f56f4ea96270e6ddb33714ecba7bd
Tenghui Zhu [Sat, 8 Oct 2016 18:36:30 +0000 (18:36 +0000)]
Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev am:
8e93abcd6c am:
f8bfc7890f
am:
da3f7d8e0c
Change-Id: Ia08a2da37724a6873f7a9e4821f0f7f1c59e38c6
Teng-Hui Zhu [Sat, 8 Oct 2016 18:34:56 +0000 (18:34 +0000)]
Merge "Make umbra lighter when the blocker is too high and has no real umbra area. am:
9c555566bf am:
9ad599930d" into nyc-mr1-dev-plus-aosp
am:
304228628f
Change-Id: I46b32ede04a6b22fd427d4dbcbc091c0a3168571
Teng-Hui Zhu [Sat, 8 Oct 2016 18:34:47 +0000 (18:34 +0000)]
Make umbra lighter when the blocker is too high and has no real umbra area. am:
9c555566bf am:
9ad599930d
am:
6ff1730df5
Change-Id: Ia7855238cfb893d591ff404a1f17ada76dd79ff0
Winson Chung [Sat, 8 Oct 2016 18:33:07 +0000 (18:33 +0000)]
Merge "Merge "Revert "Bump up preloading recents on boot up to user unlocked."" into nyc-mr1-dev am:
e8ebe11209 am:
f4e866947f" into nyc-mr1-dev-plus-aosp
am:
83c9edc8d1
Change-Id: I77be1034aa36a4348f4e80e3652cff06e41b3f01
Winson Chung [Sat, 8 Oct 2016 18:32:58 +0000 (18:32 +0000)]
Merge "Revert "Bump up preloading recents on boot up to user unlocked."" into nyc-mr1-dev am:
e8ebe11209 am:
f4e866947f
am:
aab11a8c45
Change-Id: Iab6739453817b5d50a85f081c5c9ccd97eac23a7
Winson Chung [Sat, 8 Oct 2016 18:31:20 +0000 (18:31 +0000)]
Merge "Revert "Bump up preloading recents on boot up to user unlocked." am:
501d59dcea am:
1fb2e3db87" into nyc-mr1-dev-plus-aosp
am:
478ed50d09
Change-Id: Iaa460c0863987569df70bf53622c82cb2f45d8a7
Winson Chung [Sat, 8 Oct 2016 18:31:11 +0000 (18:31 +0000)]
Revert "Bump up preloading recents on boot up to user unlocked." am:
501d59dcea am:
1fb2e3db87
am:
a6712f2872
Change-Id: I98cc678476e7af88f0d3ebe72daaa0d22cfddfdd
Adrian Roos [Sat, 8 Oct 2016 18:29:36 +0000 (18:29 +0000)]
Merge "Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev am:
b9bb518632 am:
1a299d8052" into nyc-mr1-dev-plus-aosp
am:
ebd1264769
Change-Id: Ib8dcab5fbfcc6b4d864202b0b8aeffc15fe793e3
Adrian Roos [Sat, 8 Oct 2016 18:29:27 +0000 (18:29 +0000)]
Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev am:
b9bb518632 am:
1a299d8052
am:
84aa0f1233
Change-Id: Iff0188d21d15a3aaaa9e61659749eeb4448e14e8
Adrian Roos [Sat, 8 Oct 2016 18:27:43 +0000 (18:27 +0000)]
Merge "Ambient: Re-register all trigger sensors if one fires am:
0288dcc825 am:
7157eb844a" into nyc-mr1-dev-plus-aosp
am:
7f49d4dddd
Change-Id: Id3b5384520af32ccbb11bd2c9b366f2dff2ef693
Adrian Roos [Sat, 8 Oct 2016 18:27:36 +0000 (18:27 +0000)]
Ambient: Re-register all trigger sensors if one fires am:
0288dcc825 am:
7157eb844a
am:
6041995002
Change-Id: I994192643723955af14d3a98cb75aedcdbabdf32
Dirk Dougherty [Sat, 8 Oct 2016 18:25:54 +0000 (18:25 +0000)]
Merge "Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am:
794e0d3578 am:
fc7475c5b3 am:
5d6be1abca am:
ce9fda304c" into nyc-mr1-dev-plus-aosp
am:
763f131810
Change-Id: I1f7ffc0dd5dc02703d887f4f270479df8ef1a318
Dirk Dougherty [Sat, 8 Oct 2016 18:25:46 +0000 (18:25 +0000)]
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am:
794e0d3578 am:
fc7475c5b3 am:
5d6be1abca am:
ce9fda304c
am:
92ba0420a2
Change-Id: I6d6200ee3276e2c85a8b4973411011ca1ec2e62b
Dirk Dougherty [Sat, 8 Oct 2016 18:24:01 +0000 (18:24 +0000)]
Merge "Doc change: remove intl/nn from collections paths. am:
240ddd735c am:
016f01ebfe am:
7ceecc61ec am:
256dfeea14" into nyc-mr1-dev-plus-aosp
am:
cc3e1ba191
Change-Id: Ie0beec9c1b768a791b7ac94f1b867acf5f078b92
Dirk Dougherty [Sat, 8 Oct 2016 18:23:53 +0000 (18:23 +0000)]
Doc change: remove intl/nn from collections paths. am:
240ddd735c am:
016f01ebfe am:
7ceecc61ec am:
256dfeea14
am:
eccdec22b1
Change-Id: I4a3006598b856b5687ba55f82b8db34001d158a8
Dirk Dougherty [Sat, 8 Oct 2016 18:22:07 +0000 (18:22 +0000)]
Merge "Merge "Update preview-community redirect to point at +AD." into nyc-dev am:
61d3faa52c am:
8f8fe7df92 am:
7f5f8b1df8 am:
7c2e40c715" into nyc-mr1-dev-plus-aosp
am:
56f2d07b29
Change-Id: I6e904101d38387e7c9a64c4155e305efe2570171
Dirk Dougherty [Sat, 8 Oct 2016 18:21:58 +0000 (18:21 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev am:
61d3faa52c am:
8f8fe7df92 am:
7f5f8b1df8 am:
7c2e40c715
am:
a138d7b18f
Change-Id: I5f8211e551b9859b63e906963b0cda9bc1681256
Dirk Dougherty [Sat, 8 Oct 2016 18:20:08 +0000 (18:20 +0000)]
Merge "Update preview-community redirect to point at +AD. am:
559013e711 am:
1241838fb4 am:
ddd2e0442e am:
c96f065bce" into nyc-mr1-dev-plus-aosp
am:
d12ea892c0
Change-Id: I0ce129d4ce3c8f363007faee8b4acdbb6f1c7c0e
Dirk Dougherty [Sat, 8 Oct 2016 18:19:58 +0000 (18:19 +0000)]
Update preview-community redirect to point at +AD. am:
559013e711 am:
1241838fb4 am:
ddd2e0442e am:
c96f065bce
am:
7218e6b96f
Change-Id: Ib4a2f6ab6117341d6ff0c5c3f03cd18294edc5ad
Dianne Hackborn [Sat, 8 Oct 2016 18:18:11 +0000 (18:18 +0000)]
Merge "Merge "Fix issue #
31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev am:
534a17e96c am:
6420ce51d0" into nyc-mr1-dev-plus-aosp
am:
617e324e98
Change-Id: I9690f29df145db3a8abd1773f9d42a59d0f99c94
Dianne Hackborn [Sat, 8 Oct 2016 18:18:06 +0000 (18:18 +0000)]
Merge "Fix issue #
31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev am:
534a17e96c am:
6420ce51d0
am:
2539e81a75
Change-Id: Iff0c091d30dd9b9fe1cae04b639a1eb0eeef91b5
Miao Wang [Sat, 8 Oct 2016 18:16:35 +0000 (18:16 +0000)]
Merge "Merge "Correctly pass number of input allocations for BLAS" am:
8d08d0fa83 am:
e443dd04b0 am:
e59e92d497" into nyc-mr1-dev-plus-aosp
am:
dc97314a0e
Change-Id: Ib7703b7b5d7a2c6d89945b5e2a04885353ff7a27
Miao Wang [Sat, 8 Oct 2016 18:16:26 +0000 (18:16 +0000)]
Merge "Correctly pass number of input allocations for BLAS" am:
8d08d0fa83 am:
e443dd04b0 am:
e59e92d497
am:
658c67b7ff
Change-Id: I92a02d0f08ff3d48c0f4d969e34cffc07a3dcab7
Dianne Hackborn [Sat, 8 Oct 2016 18:15:02 +0000 (18:15 +0000)]
Fix issue #
31305336: File corrupt: too many wake locks 101 am:
cb99a72e62 am:
50b9f3513c
am:
a89e1ec692
Change-Id: Ia020798e19ced931b0f690c8626ccf728e4157e4
Wei Liu [Sat, 8 Oct 2016 18:13:55 +0000 (18:13 +0000)]
Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev am:
30a0f96250 am:
99892beb39
am:
93096a7479 -s ours
Change-Id: Ibc1e05ea54e716f4ea6fe562200e8c72bc4c2e77
Wei Liu [Sat, 8 Oct 2016 18:12:40 +0000 (18:12 +0000)]
Allow shell to acquire wakelock. DO NOT MERGE. am:
898468657e am:
ec7c07e2a5
am:
637a0cc98a -s ours
Change-Id: Ia2dff3637b2a0220266e04dda1680a973778db03
Christopher Tate [Sat, 8 Oct 2016 18:11:24 +0000 (18:11 +0000)]
Eliminate unnecessary object churn in job scheduler updating am:
eafb535072 am:
84e9961a7c
am:
893930630f
Change-Id: I8a34923996d5dd76519b881c62077419f12fd2fc
Paul Stewart [Sat, 8 Oct 2016 18:10:06 +0000 (18:10 +0000)]
Merge "Tethering: check if configManager is null" into nyc-mr1-dev am:
7d25ab7b11 am:
7a587e85cd
am:
bce0a8dd0c
Change-Id: I1faa655725aa42c11dbf1f2611c70630fab730b0
Rebecca Silberstein [Sat, 8 Oct 2016 18:08:57 +0000 (18:08 +0000)]
Tethering: check if configManager is null am:
b07f140904 am:
7aca691f27
am:
5e935709ce
Change-Id: Ifabfa1b3ed9eef35afe01568cfd8702161b1575f
Rob Carr [Sat, 8 Oct 2016 18:06:25 +0000 (18:06 +0000)]
Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev am:
c65dc5529e am:
2c1a026ee5
am:
972c86df31
Change-Id: I0b88b785cb97a6872563927f773af9f48d9dbd10
Colin Cross [Sat, 8 Oct 2016 18:02:24 +0000 (18:02 +0000)]
Merge "resolve merge conflicts of
5e664d9 to master"
TreeHugger Robot [Sat, 8 Oct 2016 07:34:52 +0000 (07:34 +0000)]
Merge "Added minimum supported version in SQLiteOpenHelper"
Colin Cross [Sat, 8 Oct 2016 00:43:10 +0000 (17:43 -0700)]
resolve merge conflicts of
5e664d9 to master
Test: mm -j
Change-Id: I86391311447efdfac47d2d33425dae7ea3057fd1
Suprabh Shukla [Thu, 6 Oct 2016 21:41:35 +0000 (14:41 -0700)]
Added minimum supported version in SQLiteOpenHelper
Added a convenience mechanism to delete the whole database if it is of
a version that is so old that the application does not want to support
upgrading it. SQLiteOpenHelper now automatically deletes such a database
and creates a fresh one with the newest version provided. A callback
onBeforeDelete is added if the application wants to collect some data
from the db before it is deleted.
Test: Tested by upgrading contacts database using ContactsDatabaseHelper
Bug:
31559016
Change-Id: I3f924d247cdca2015c4244cc987de2538a086651
TreeHugger Robot [Fri, 7 Oct 2016 19:40:16 +0000 (19:40 +0000)]
Merge "Convert VD/AVD to FastNative"
Lei Yu [Fri, 7 Oct 2016 17:34:19 +0000 (17:34 +0000)]
Merge "Make Timezone selection and selected value has same logic"
John Reck [Fri, 7 Oct 2016 17:33:44 +0000 (10:33 -0700)]
Convert VD/AVD to FastNative
Test: build & boots
Change-Id: I6519ba245eca1a43fb00de36c91a05a9740c8c5f
Andrii Kulian [Fri, 7 Oct 2016 17:29:45 +0000 (17:29 +0000)]
Merge "Make stack field private in TaskRecord"
Jakub Pawlowski [Fri, 7 Oct 2016 15:11:55 +0000 (15:11 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)" am:
44c013d739 am:
6fe3900791 am:
56757a44a6
am:
4984d66b6a
Change-Id: I4b78ff54941ada956d4330a6192d0f1c279d953c
Jason Monk [Fri, 7 Oct 2016 15:10:46 +0000 (15:10 +0000)]
Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev am:
3523728e77 am:
80c4bc6bf0
am:
df6c5162c7
Change-Id: Idd9c8bbdd71b446ada15211cf4b6ab7275587919
Jason Monk [Fri, 7 Oct 2016 15:09:42 +0000 (15:09 +0000)]
QS: Don't set flashlight state when we don't have an id am:
ad32c550c0 am:
3a8037d449
am:
0490a848c1
Change-Id: Ib7969b0968fedf9364dbfa53be86aa1cb42dc745
Lei Yu [Fri, 7 Oct 2016 15:02:40 +0000 (15:02 +0000)]
Merge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev am:
3fd73a645a am:
949273e45d
am:
768ceb9e25
Change-Id: I964856283e15992777ac935e3e14453ba0a6bca4
jackqdyulei [Fri, 7 Oct 2016 15:01:43 +0000 (15:01 +0000)]
Add "FILTER_NOT_HIDE" to filter out the apps. am:
4bf191ca75 am:
6b88c550af
am:
b9b59babe3
Change-Id: I8d6c66c9c229fb5f5d6855ae05c8d8f97ad85cd9
Bill Yi [Fri, 7 Oct 2016 14:59:20 +0000 (14:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e03f970ab4 -s ours am:
9474a63f50 -s ours
am:
035727cf32 -s ours
Change-Id: I6d96b0e7bbd1ef7097898e51e437122f3212c7aa
Bill Yi [Fri, 7 Oct 2016 14:58:33 +0000 (14:58 +0000)]
Import translations. DO NOT MERGE am:
cf2df3bb6e -s ours am:
778f8930b4 -s ours
am:
df14300b5e -s ours
Change-Id: I40aca273dec5494ef673d89b6f8902ad28908577
Bill Yi [Fri, 7 Oct 2016 14:57:29 +0000 (14:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f22cb06b4d -s ours am:
d5762192f7 -s ours
am:
af0c4f4f89 -s ours
Change-Id: Ie050071fa6fe20302c30cfaa49c084d315672f14
Bill Yi [Fri, 7 Oct 2016 14:56:34 +0000 (14:56 +0000)]
Import translations. DO NOT MERGE am:
49baec862b -s ours am:
d89a7ca92d -s ours
am:
ea0179942b -s ours
Change-Id: I4e85d14677f545ca3419d37551e1a202fe50e592
Jorim Jaggi [Fri, 7 Oct 2016 14:55:43 +0000 (14:55 +0000)]
Merge "Reload state when user unlocks" into nyc-mr1-dev am:
a92006ef6c am:
a58cb2e4d7
am:
ce32ea697f
Change-Id: Ib4a3b490986a69e4396fbfe399e78d4c03e0973a
TreeHugger Robot [Fri, 7 Oct 2016 14:51:09 +0000 (14:51 +0000)]
Jakub Adamek [Fri, 7 Oct 2016 10:53:39 +0000 (11:53 +0100)]
Adding minimal customizable background colour support.
This adds back minimal support from
https://googleplex-android-review.googlesource.com/#/c/
1442940/1
because the bigger thing had to be reverted.
Bug:
31459804
Change-Id: I545d1f7639c9dada417e95b5da6290414d3de05d
(cherry picked from commit
d64a158269b8e10baaa2c2782fd017b594a078d4)
Jakub Adamek [Fri, 7 Oct 2016 10:27:57 +0000 (11:27 +0100)]
Revert "Adding customizable background colour support."
This reverts commit
eedebc4850749ba8a7a70e17a41399997806856a.
This needs to be submitted only with the next change which re-adds
minimal support.
Change-Id: I1f269a7c3bbd11fc60f61d6f23e78a1933f182c7
(cherry picked from commit
91181aa5deafac0660e8132964e50a4ec25da00b)
Jakub Adamek [Fri, 7 Oct 2016 09:53:34 +0000 (10:53 +0100)]
Revert "Improving customization in DeviceDefault themes."
This reverts commit
426e7a0f8357b7401a4d3fc00ff89c5dd0de51c4.
(cherry picked from commit
801cb62b9fdb90e59a94a9791ead00e46607f1be)
Change-Id: Idef7570e1a2b1fac9b1a0ec913b378732fb3a1ab
John Reck [Fri, 7 Oct 2016 14:42:07 +0000 (14:42 +0000)]
Merge changes I914c0852,Id6ae9ed4
* changes:
Add a graph to jitter test
Jitter-specific test exploration
Jorim Jaggi [Fri, 7 Oct 2016 13:11:44 +0000 (15:11 +0200)]
Merge commit '
2a30b7600992d136f63b26aa28204e8e97730e10' into HEAD
Change-Id: Ibcd5bab971c82a551623d226e4490b39d32fa8c0
Andrii Kulian [Fri, 7 Oct 2016 06:11:56 +0000 (23:11 -0700)]
Make stack field private in TaskRecord
This is needed to enforce usage of setter - prerequisite
for ag/
1499587.
Change-Id: I194008899d8320a213e82b9106f0589f499941b4
Test: Refactoring only. Manual and existing tests still pass.
TreeHugger Robot [Fri, 7 Oct 2016 04:54:35 +0000 (04:54 +0000)]
Merge "Add read/write performance test for AppFuse."
Daichi Hirono [Thu, 6 Oct 2016 06:28:36 +0000 (15:28 +0900)]
Add read/write performance test for AppFuse.
The perforamnce test read from/write to 10MB data to AppFuse file 100
times.
Test: adb shell am instrument -w com.android.mtp.perftests/android.support.test.runner.AndroidJUnitRunner
Bug:
31982374
Change-Id: I8f78ee43d8078d7f1098249b28491cb43b5f3bef
Lorenzo Colitti [Fri, 7 Oct 2016 01:08:31 +0000 (01:08 +0000)]
Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev am:
291af5c568 am:
80f15e3b4c am:
6632944a01
am:
5ab84cff1a
Change-Id: I755b7d340bb996a06bbfda41951b992d36f761a5
Lorenzo Colitti [Fri, 7 Oct 2016 01:07:30 +0000 (01:07 +0000)]
Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi. am:
f11ee9f592 am:
d2ad8ece53 am:
52807ea4f1
am:
446ea5678a
Change-Id: I92d3d47fbb9d383e6a1a5cc45a23fa81d3aa5a5c
John Reck [Fri, 7 Oct 2016 00:39:49 +0000 (17:39 -0700)]
Add a graph to jitter test
Test: manual
Change-Id: I914c0852d801d9cd5c4f14cc5a9cfae4b64ff334
Lorenzo Colitti [Fri, 7 Oct 2016 01:06:06 +0000 (01:06 +0000)]
Slightly simplify IpManager#compareProvisioning. am:
b77b775213 am:
fdac9b608b am:
6f8180cfe0
am:
67b5994bb6
Change-Id: I88e9ed699feea37ef5e761ca9b545af006529c8b
Erik Kline [Fri, 7 Oct 2016 01:05:05 +0000 (01:05 +0000)]
Conditionally accept loss of on-link IPv6 DNS servers am:
5b437d6ff9 am:
d719d95139 am:
c0a910aaf1
am:
d938b95cec
Change-Id: I66d37c88c848160b86aeb62f267915bbbd366e52
Erik Kline [Fri, 7 Oct 2016 01:03:58 +0000 (01:03 +0000)]
Refactor "avoid bad wifi" logic into a utility class am:
065ab6ee40 am:
23cdacbec6 am:
0cb8d5247e
am:
73b9d8061c
Change-Id: Ie3d058d6c9da43763d10b0a2bc96171d07673e9d
Doris Liu [Fri, 7 Oct 2016 01:03:02 +0000 (01:03 +0000)]
Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev am:
8d4c87b0bf am:
e4459da272
am:
e5e95e083a
Change-Id: I178511e4410bc01bf5f2263a73435b03b630df0b
Doris Liu [Fri, 7 Oct 2016 01:02:09 +0000 (01:02 +0000)]
Restrict AVD and VD parsing to the current element instead of the whole document am:
1f859716a8 am:
897f5ca748
am:
43104389f9
Change-Id: I1730b80585c5d5064fda8ec4d598a95651d7c3eb
Tenghui Zhu [Fri, 7 Oct 2016 01:01:21 +0000 (01:01 +0000)]
Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev am:
99224b311c am:
3445b58a6d
am:
a07f03ea92
Change-Id: I47a441ebd926c44e397d1869519cfbb959ef286b
Teng-Hui Zhu [Fri, 7 Oct 2016 01:00:32 +0000 (01:00 +0000)]
Update JavaDoc about animatable on VectorDrawable am:
bb12929470 am:
8bf7fd89e7
am:
a504e12e25
Change-Id: I8b97f242a22e763e23169b9cb55d87afd2a6f471
Adam Lesinski [Fri, 7 Oct 2016 00:59:36 +0000 (00:59 +0000)]
Merge "Fix thread race caused double free issue." into nyc-mr1-dev am:
68ec3695d0 am:
a2b5c8a912
am:
157d864264
Change-Id: I8d2bf30740b89e49a59927a867be2334aeb5b608
songjinshi [Fri, 7 Oct 2016 00:58:43 +0000 (00:58 +0000)]
Fix thread race caused double free issue. am:
5754b41c20 am:
09901f3bc9
am:
995c7a410b
Change-Id: I5bf330035a01e4f94235561342bc942142d9f007
Bert McMeen [Fri, 7 Oct 2016 00:57:55 +0000 (00:57 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet am:
70c6411a10 am:
19404c6f93 am:
20cf00152d am:
c9956e2ea8
am:
3da2d04626
Change-Id: Id4e48d9f7b77134505b2ca9a7b16fe42458e051c
Chris Tate [Fri, 7 Oct 2016 00:56:58 +0000 (00:56 +0000)]
Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev am:
ee28c8c22c am:
d8e73720f6
am:
22795dad96
Change-Id: Ida74bfdc0ead02a0307407d94b647bb8c65bad97
Christopher Tate [Fri, 7 Oct 2016 00:56:11 +0000 (00:56 +0000)]
Explicitly close FD binder parameters in backup/restore API calls am:
91bb0e5cca am:
3fa99a6d11
am:
79a3ee5a98
Change-Id: Idc4ae96cf8237bd6439604476d7f5e7887cb8655
Phil Weaver [Fri, 7 Oct 2016 00:55:20 +0000 (00:55 +0000)]
Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev am:
8051c9222e am:
b88b084684
am:
5e59b7ea1d
Change-Id: I7b6edd488ca42765ece7e0f14d2f6c6dde5363e5
Phil Weaver [Fri, 7 Oct 2016 00:54:20 +0000 (00:54 +0000)]
Make magnification ignore invisible wallpaper. am:
473af05b82 am:
2de5ca2c65
am:
5a48cf3aa1
Change-Id: I72d6ec29c5c1b39c386281b9edaeb12874a49f09
Dianne Hackborn [Fri, 7 Oct 2016 00:52:45 +0000 (00:52 +0000)]
Merge "Fix issue #
31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev am:
c26c98cd4a am:
c361eb7c85
am:
77a93d6045
Change-Id: I15d3e1fb364791a5bb1bfd16be88dc307772d72e
Dianne Hackborn [Fri, 7 Oct 2016 00:51:34 +0000 (00:51 +0000)]
Fix issue #
31403654: Elevation of privilege vulnerability in deviceidle service am:
eb909e3cda am:
86e1f6f3e1
am:
4d59e2454e
Change-Id: I9284a4d10f9364e3bb0f1485a2c6ae7c253a7d57
Jim Miller [Fri, 7 Oct 2016 00:50:33 +0000 (00:50 +0000)]
Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev am:
bf79852ae4 am:
aa3e039ad7
am:
fa2d717959
Change-Id: I520b96c0b8d130069e7752ca4716936b160a5e7a
Jim Miller [Fri, 7 Oct 2016 00:49:38 +0000 (00:49 +0000)]
Add metrics logging for critical fingerprintd errors am:
c57c8d934c am:
71558c252b
am:
8b9e1d0026
Change-Id: Ic322a7a62987efd8c3091c5819ec2ffcb02b94fe
Adarsh Fernando [Fri, 7 Oct 2016 00:48:48 +0000 (00:48 +0000)]
Docs: Redirect for Android Studio IR Flight Recorder am:
1face37061 am:
5fe735fe2c am:
bce10d350d am:
5e9c44497e
am:
3a47ccbe99
Change-Id: I00e39f4d3ac11b5a373ef3f81b562c169ca0b342
Bill Yi [Fri, 7 Oct 2016 00:47:52 +0000 (00:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
b8e046a8a2 -s ours am:
2f09527ec4 -s ours
am:
ede8a47783 -s ours
Change-Id: I46e7e9d0d61096e54ace2099920a411f58e8a6df
Bill Yi [Fri, 7 Oct 2016 00:46:58 +0000 (00:46 +0000)]
Import translations. DO NOT MERGE am:
53edc8f204 -s ours am:
1a7f727ffe -s ours
am:
58c586616b -s ours
Change-Id: I40944a75406e99b30b688c52279a8c0dc0f4513d
OSDN Git Service
