OSDN Git Service
Chong Zhang [Thu, 1 Sep 2016 06:58:46 +0000 (06:58 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev am:
dc02317d92 am:
4800ade070
am:
b97ce87d47
Change-Id: I41da230d6264cd8e5ea9b9be52756f651441e8da
Chong Zhang [Thu, 1 Sep 2016 06:58:43 +0000 (06:58 +0000)]
Do not log surface destroy by default am:
ad23b3fa11 am:
104a58b3c4
am:
ec0a2e580b
Change-Id: I875ac7e84a12457f145d6f0b297a1032d24f93a5
Pablo Ceballos [Thu, 1 Sep 2016 06:58:39 +0000 (06:58 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev am:
9103680158 am:
e584593641
am:
b0b25b6a6f
Change-Id: I6d35f7e1066e8acc243e5ab818e9e36125797026
Pablo Ceballos [Thu, 1 Sep 2016 06:58:35 +0000 (06:58 +0000)]
Handle null Surface in createVirtualDisplay am:
eb3370d490 am:
b7d3f5b63b
am:
c7b8b28042
Change-Id: Iac6b73c063ee6fdc66040dffc89308dab70682e9
Sudheer Shanka [Thu, 1 Sep 2016 06:58:31 +0000 (06:58 +0000)]
Merge "Allow package verifier and uninstaller to do silent uninstalls." into nyc-mr1-dev am:
0b69970e36 am:
608d4d8a46
am:
bdee196672
Change-Id: I39b87ab45f0a640a62d98e9f5e03747140bd0118
TreeHugger Robot [Thu, 1 Sep 2016 06:46:05 +0000 (06:46 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 1 Sep 2016 06:44:53 +0000 (06:44 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 1 Sep 2016 06:38:12 +0000 (06:38 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 1 Sep 2016 06:14:55 +0000 (06:14 +0000)]
Merge "resolve merge conflicts of
437062e to master"
TreeHugger Robot [Thu, 1 Sep 2016 04:48:15 +0000 (04:48 +0000)]
Merge "Remove wtf log when optional apps are not found."
Bill Yi [Thu, 1 Sep 2016 04:17:55 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1511fbc2a37b615b86a01172f1b05b927a5caeb8
Auto-generated-cl: translation import
Sudheer Shanka [Thu, 1 Sep 2016 03:53:09 +0000 (20:53 -0700)]
resolve merge conflicts of
437062e to master
Change-Id: I7404a0ab39416bbd90d7c0fb1c478ec51436b06e
Jeff Sharkey [Thu, 1 Sep 2016 03:18:43 +0000 (03:18 +0000)]
Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev am:
c081d2b870 am:
8215d988eb
am:
31374d7b95 -s ours
Change-Id: Ied8f5ca6dea39b52431017830ef74606742b2136
Jeff Sharkey [Thu, 1 Sep 2016 03:18:35 +0000 (03:18 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE. am:
6ed7418228 am:
b1123e7871
am:
72a6695bbc -s ours
Change-Id: I66d4c38253cc93bdd81c422f5120ad99e5e02b2b
Jeff Sharkey [Thu, 1 Sep 2016 03:18:26 +0000 (03:18 +0000)]
Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev am:
26887dc880 am:
444af99af6
am:
bf41bf19ff -s ours
Change-Id: I0db626a5c94b2fe9363855ef84bbfb1ba15c8876
Jeff Sharkey [Thu, 1 Sep 2016 03:18:18 +0000 (03:18 +0000)]
DO NOT MERGE. Update lockscreen message when user unlocked. am:
99e1bca91a am:
be4949f489
am:
aae09a8e8e -s ours
Change-Id: Ic0a8213d35c0d0668203d56a9986dada7316d1c5
Jeff Sharkey [Thu, 1 Sep 2016 03:15:25 +0000 (03:15 +0000)]
Merge "DO NOT MERGE. Clarify FileObserver docs for null value." into nyc-mr1-dev am:
cdd2b6f311 am:
50e3aa4181
am:
6ae09ef48c -s ours
Change-Id: Icee2a01d1dc7c5520514841f4928510fdc14dcb6
Jeff Sharkey [Thu, 1 Sep 2016 03:15:16 +0000 (03:15 +0000)]
DO NOT MERGE. Clarify FileObserver docs for null value. am:
c041f5a3b8 am:
a341d70602
am:
d11c21f371 -s ours
Change-Id: Ibab9688a80d2b504d1c7c293c5584bb4118513bc
Todd Kennedy [Thu, 1 Sep 2016 03:15:07 +0000 (03:15 +0000)]
Merge "throw if >1 verifier found" into nyc-mr1-dev am:
a1ce6ee444 am:
2ebbd82c5a
am:
e0291e7d7d
Change-Id: I8f306173e7f1229a557eacc770279826890b99a0
Todd Kennedy [Thu, 1 Sep 2016 03:14:57 +0000 (03:14 +0000)]
throw if >1 verifier found am:
5320ee42c6 am:
73a05d1865
am:
f1582a94f0
Change-Id: I61dd0a596f7c46bd0c37c37d2e288bc7681991da
Felipe Leme [Thu, 1 Sep 2016 03:14:47 +0000 (03:14 +0000)]
Merge "Revert "Adds a section for unaccounted data."" into nyc-mr1-dev am:
a5e0fedbb3 am:
6529bad2e4
am:
02f2bb732d
Change-Id: I39cb5c0e4af6a774d8e69c9eab2b7fa5c41bdf4c
Felipe Leme [Thu, 1 Sep 2016 03:04:16 +0000 (03:04 +0000)]
Revert "Adds a section for unaccounted data." am:
952a0d9fdb am:
ad35387fa8
am:
5d16d2ee6b
Change-Id: I4afb7ecd1745e6cdd6462f9db7e9bf54e5793926
Adrian Roos [Thu, 1 Sep 2016 03:04:12 +0000 (03:04 +0000)]
Merge "Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped" into nyc-dr1-dev am:
f06bb5c0f9 am:
03f206a2ed am:
7f0c7757c0
am:
2022b56538
Change-Id: I9c643e2fb4e124bea35497f97d9e1d26a5c76e23
Adrian Roos [Thu, 1 Sep 2016 03:04:09 +0000 (03:04 +0000)]
Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped am:
5c97ff23a3 am:
865f437e99 am:
7634e5e52c
am:
20fce0ac80
Change-Id: I8d1870bf8e0049fab7f1ece4974388f04cad974e
Wyatt Riley [Thu, 1 Sep 2016 03:04:04 +0000 (03:04 +0000)]
Merge "AGNSS LPP settings for Telus & Bell" into nyc-dr1-dev am:
3554ce0e18 am:
59ba8dfa50 am:
1dd614db2a
am:
0d41d159f9
Change-Id: I94778a8c4efd92029af36f5107a94ce4d82a5ce3
Wyatt Riley [Thu, 1 Sep 2016 03:04:00 +0000 (03:04 +0000)]
AGNSS LPP settings for Telus & Bell am:
5dadc4dbb4 am:
3af39b4f2d am:
60eeaab4ef
am:
72dee0cab3
Change-Id: Ic7f16121c85aac32f9ba54d9713ef2a6ece41443
Rob Carr [Thu, 1 Sep 2016 03:01:03 +0000 (03:01 +0000)]
Merge "PopupWindow: Gravity fixes." into nyc-mr1-dev am:
8330a91def am:
7a98efb80c
am:
8616ad9541
Change-Id: I3ccc8591d833afd2ea6d3ce1bb991d244e69f0f6
Robert Carr [Thu, 1 Sep 2016 03:01:00 +0000 (03:01 +0000)]
PopupWindow: Gravity fixes. am:
085160612d am:
a732ea6c1f
am:
0ceb3cd785
Change-Id: I9e8dbd01cc0dfa0e115a5f0270912cbb67e9213d
Wyatt Riley [Thu, 1 Sep 2016 03:00:56 +0000 (03:00 +0000)]
Merge "Custom LPP AGPS config for Rogers" into nyc-dr1-dev am:
e13df588a4 am:
b0857a6c27 am:
3aab7f8ae2
am:
7362c913b0
Change-Id: I18cead992280f1da64511f2815bae83875cf7fb0
Wyatt Riley [Thu, 1 Sep 2016 03:00:53 +0000 (03:00 +0000)]
Custom LPP AGPS config for Rogers am:
2ebd1f6b75 am:
efdb5072ab am:
fd26dc5bf1
am:
3d743a5356
Change-Id: Ib8819a37da414e644b4208c1468b44864504440b
Felipe Leme [Thu, 1 Sep 2016 03:00:48 +0000 (03:00 +0000)]
Merge "Remove wtf log when optional apps are not found." into nyc-mr1-dev am:
f29f973643 am:
957391839d
am:
5275042255
Change-Id: Ibecc779dbfa2bc1f9b0e2e9c12d5174e842e32cd
Felipe Leme [Thu, 1 Sep 2016 02:57:07 +0000 (02:57 +0000)]
Remove wtf log when optional apps are not found. am:
6fa02e95ba am:
e20c47686b
am:
0f148aac58 -s ours
Change-Id: I9b3a8cbdc3c4f011a63afcdd7abbf580519d29af
Felipe Leme [Wed, 31 Aug 2016 15:47:50 +0000 (08:47 -0700)]
Remove wtf log when optional apps are not found.
Test: none
Change-Id: I9f94c2ab47eb78d05754c85aafc13e1e238ead04
Fixes:
31177447
(cherry picked from commit
6fa02e95ba41578d8e8d16f8201f90ca37634183)
Hall Liu [Thu, 1 Sep 2016 01:41:47 +0000 (01:41 +0000)]
Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev am:
4c01673a7b am:
983295d420
am:
e2dfceef0b
Change-Id: Idaa0cbedf00ed377de9f98eace43095d42692629
Hall Liu [Thu, 1 Sep 2016 01:41:12 +0000 (01:41 +0000)]
Rename PROPERTY_SHOW_CALLBACK_NUMBER am:
25c7c4d100 am:
506b924421
am:
d961974fab
Change-Id: Ie38d15e1d04697332fc5cca09261b42dac4a6086
Allen Hair [Thu, 1 Sep 2016 01:40:58 +0000 (01:40 +0000)]
Merge "Fine tune code coverage filters for SystemUI tests." into nyc-mr1-dev am:
e9a9e6b92c am:
8327a96262
am:
e88143ea07
Change-Id: Ibb35f4570626f37e9becf4cfffbacc4bd9972cfd
Allen Hair [Thu, 1 Sep 2016 01:39:24 +0000 (01:39 +0000)]
Fine tune code coverage filters for SystemUI tests. am:
8fef05f2c1 am:
2d0504edbf
am:
dcb4f1aaaa
Change-Id: Ie817b5126c3d9e18385aa8ea8471fcd629bb7cfa
Svetoslav Ganov [Thu, 1 Sep 2016 01:33:46 +0000 (01:33 +0000)]
Merge "Properly close fd backing a MemoryIntArray" into nyc-dev am:
84763eb770 am:
eb59bf4e5d am:
509f536b48 am:
f1b18cae8c
am:
d039e6fd7c
Change-Id: Iabce1ec0ce54cfc110d2fd5ddca261eae3bd3a9e
Svetoslav Ganov [Thu, 1 Sep 2016 01:33:42 +0000 (01:33 +0000)]
Properly close fd backing a MemoryIntArray am:
e257d6e167 am:
916f703b90 am:
853f2c51d9 am:
fe45224a5b
am:
0ee7d16158
Change-Id: Icf87b3f23276b6ec54e3a39f79a1e54c5aaa87dc
Amith Yamasani [Thu, 1 Sep 2016 01:33:38 +0000 (01:33 +0000)]
Merge "Merge "Call Debug.getPss without a lock held" into nyc-mr1-dev am:
9edadbd87a am:
ea4420b557" into nyc-mr1-dev-plus-aosp
am:
088844d448
Change-Id: Ibde2256dea725dad1ffea77c660afdf19c90607a
Amith Yamasani [Thu, 1 Sep 2016 01:33:34 +0000 (01:33 +0000)]
Merge "Call Debug.getPss without a lock held" into nyc-mr1-dev am:
9edadbd87a am:
ea4420b557
am:
a9471e294a
Change-Id: Iecc4261eff45f24758b5d927ce04972aa227a16c
Amith Yamasani [Thu, 1 Sep 2016 01:33:23 +0000 (01:33 +0000)]
Merge "Call Debug.getPss without a lock held am:
10e8f16add am:
f10d31f5d0" into nyc-mr1-dev-plus-aosp
am:
4c8c594996
Change-Id: Ibe24bccbc0500f4cd6ffcc9cae9074c037a68f71
Amith Yamasani [Thu, 1 Sep 2016 01:33:19 +0000 (01:33 +0000)]
Call Debug.getPss without a lock held am:
10e8f16add am:
f10d31f5d0
am:
65fdd196fa
Change-Id: Ic41194d60d8919d69123bd40082c86b2a1e22571
Narayan Kamath [Thu, 1 Sep 2016 01:33:09 +0000 (01:33 +0000)]
Merge changes from topic 'am-
ee884cf0aecf458e82b1ef62075c2045' into nyc-mr1-dev-plus-aosp
am:
85bc1eb580
Change-Id: Ic704a714880fe8943239167c88a10d504a040199
Narayan Kamath [Thu, 1 Sep 2016 01:32:56 +0000 (01:32 +0000)]
Merge "Add a whitelist of sockets on fork." into nyc-mr1-dev am:
f7d8a1648b am:
666c7ae3e4
am:
549a5d170e
Change-Id: I389a26015190254bc4b29ab1eeb694a6ad8f3a94
Bill Yi [Thu, 1 Sep 2016 01:32:32 +0000 (18:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia040aee69f53d3355338af035fa8c650da452080
Auto-generated-cl: translation import
Narayan Kamath [Thu, 1 Sep 2016 01:32:14 +0000 (01:32 +0000)]
Add a whitelist of sockets on fork. am:
3764a260f0 am:
3f58724a46
am:
ac20f54410
Change-Id: I56416640ecad4d65089f75b510e1266e6dae594d
Scott Main [Thu, 1 Sep 2016 01:27:25 +0000 (01:27 +0000)]
Merge "Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev am:
a06f40bd05 am:
1c30ff407e am:
e9274876ae am:
b64e7adf7a" into nyc-mr1-dev-plus-aosp
am:
812e424938
Change-Id: I426897d70231c520e65800cdf00060d23061d6f0
Scott Main [Thu, 1 Sep 2016 01:27:22 +0000 (01:27 +0000)]
Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev am:
a06f40bd05 am:
1c30ff407e am:
e9274876ae am:
b64e7adf7a
am:
8b7ef74b70
Change-Id: I2d20fb5d24be1e830b75567bdce5a50758a3b9a3
Jakub Pawlowski [Thu, 1 Sep 2016 01:27:03 +0000 (01:27 +0000)]
Merge "Separate advertiser from GATT client (1/4)" am:
5f87c4539a am:
40a16ea242 am:
9f341e4e49
am:
8348bd2317
Change-Id: I15b6c8ab87822e5f33bdfabcb8e09e8ce9501cd7
Scott Main [Thu, 1 Sep 2016 01:26:51 +0000 (01:26 +0000)]
Merge "resolve merge conflicts of
e8a3ea8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am:
b393a8195c
Change-Id: Ia3d48052a5f9c6f727287714d37a661cc9d8772e
smain@google.com [Thu, 1 Sep 2016 01:26:48 +0000 (01:26 +0000)]
resolve merge conflicts of
e8a3ea8 to nyc-mr1-dev-plus-aosp
am:
151833ab14
Change-Id: Icbde16bb62da630836fe908fa7ca088fe95701ba
Chih-hung Hsieh [Thu, 1 Sep 2016 01:26:40 +0000 (01:26 +0000)]
Merge "Fix google-explicit-constructor warnings in libs/hwui." am:
7207562ff7 am:
d7a69e04eb am:
842f1e48e7
am:
1f50f80aab
Change-Id: I713bd07fee150cc684e630045e02872b23062a5a
Chih-hung Hsieh [Thu, 1 Sep 2016 01:26:36 +0000 (01:26 +0000)]
Merge "Fix google-explicit-constructor warnings in media/mca." am:
2cace65f71 am:
4836d07980 am:
edd824b94a
am:
d835145d2f
Change-Id: Ia15a7ea301c489653f3f95356328248b27da293a
Neil Fuller [Thu, 1 Sep 2016 01:18:32 +0000 (01:18 +0000)]
Merge "Fix receive timeout on LocalSocket" am:
7a9c0cd854 am:
680ec020a1 am:
ef1fb4889a
am:
0aa7d4bb3f
Change-Id: I35b4ff81c9263a3a2d3052602fe43bc37377c733
Sergio Giro [Thu, 1 Sep 2016 01:18:28 +0000 (01:18 +0000)]
Merge "java.security.Principal: add default method Principal#implies" am:
0c8c4a5d98 am:
e639bbd7d0 am:
61c0996d6f
am:
016e850921
Change-Id: I35ad05729d5575b2e790547f2bede8c849395ada
Sergio Giro [Thu, 1 Sep 2016 01:18:23 +0000 (01:18 +0000)]
Merge "java.security.SecretKey: now extends from Destroyable" am:
c7bd0d0adc am:
8a5790a287 am:
d4b193c30c
am:
22b8317a49
Change-Id: I55b5522eb98b5db4c8599202361ab9595a38d461
Sergio Giro [Thu, 1 Sep 2016 01:18:18 +0000 (01:18 +0000)]
Merge "java.security: update java.security.KeyStore to jdk8u60" am:
d53ae2c285 am:
565c1fbf8b am:
e04c029ed5
am:
87ececf5c8
Change-Id: I970ea89c8e278b675ef63645224e456d932b614b
Sergio Giro [Thu, 1 Sep 2016 01:18:13 +0000 (01:18 +0000)]
Merge "java.security.cert: update classes in java.security.cert (part 2)" am:
9484bff017 am:
47f7d8384b am:
0ac5c50850
am:
7790666747
Change-Id: Ia6ec15ec97fecda1a182b5b1b875fcfb8446dc5e
Android Build Merger (Role) [Thu, 1 Sep 2016 01:12:50 +0000 (01:12 +0000)]
Merge "Merge "Adds a section for unaccounted data." into nyc-mr1-dev am:
63ee361d4e am:
f89827b1d9 am:
deaeef0bc0"
Android Build Merger (Role) [Thu, 1 Sep 2016 01:12:33 +0000 (01:12 +0000)]
Merge "Adds a section for unaccounted data. am:
54dc9edc52 am:
e2e58543a0 am:
5c09e77b77"
Android Build Merger (Role) [Thu, 1 Sep 2016 01:12:24 +0000 (01:12 +0000)]
Merge "Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev am:
59b5c1030c am:
d4925d59cf am:
c090c26ed1 am:
1757c92105"
Svetoslav Ganov [Thu, 1 Sep 2016 01:12:21 +0000 (01:12 +0000)]
Merge "resolve merge conflicts of
a2c1196 to master - continued"
Felipe Leme [Thu, 1 Sep 2016 01:11:23 +0000 (01:11 +0000)]
Merge "Adds a section for unaccounted data." into nyc-mr1-dev am:
63ee361d4e am:
f89827b1d9
am:
deaeef0bc0
Change-Id: I938f127453513e1a953fb157f937d19217e244be
Felipe Leme [Thu, 1 Sep 2016 01:11:19 +0000 (01:11 +0000)]
Adds a section for unaccounted data. am:
54dc9edc52 am:
e2e58543a0
am:
5c09e77b77
Change-Id: I528b8b4e8e8f7e5403fe9c1536a8fd9211d6813c
Mike Tsao [Thu, 1 Sep 2016 01:11:15 +0000 (01:11 +0000)]
Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev am:
59b5c1030c am:
d4925d59cf am:
c090c26ed1
am:
1757c92105
Change-Id: Iaa07f7b05044a11eda31b22efc785509d997b31a
Jason Monk [Thu, 1 Sep 2016 01:11:10 +0000 (01:11 +0000)]
Fix QS CTS failure caused by tile backup am:
34f6cbc288 am:
89fb99c8e9 am:
0318c9a681
am:
10bd4997bc
Change-Id: Ia150821cf25bdf4494a3202c7632557a9858284d
Svetoslav Ganov [Thu, 1 Sep 2016 01:11:03 +0000 (01:11 +0000)]
Merge "Properly close fd backing a MemoryIntArray" into nyc-mr1-dev am:
43896cbc02 am:
eaf5301f5e
am:
8f3a306c32
Change-Id: I149fdcc7e697246ce36b05c10a87af20e5d077c7
Svetoslav Ganov [Thu, 1 Sep 2016 01:09:00 +0000 (18:09 -0700)]
resolve merge conflicts of
a2c1196 to master - continued
Change-Id: I1b3c0e1a42b4cbb025de049e95d5377a162d58d1
Svetoslav Ganov [Thu, 1 Sep 2016 01:02:57 +0000 (18:02 -0700)]
resolve merge conflicts of
a2c1196 to master
Change-Id: I221f03e2cda9e677199698d492d16788c25c9e96
Chong Zhang [Thu, 1 Sep 2016 00:56:10 +0000 (00:56 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev am:
dc02317d92
am:
4800ade070
Change-Id: I9f3b7958a2e8c740a218fdafcafae37cb179ef09
Chong Zhang [Thu, 1 Sep 2016 00:56:05 +0000 (00:56 +0000)]
Do not log surface destroy by default am:
ad23b3fa11
am:
104a58b3c4
Change-Id: I99239c9c3d6f5129dfb5a7254dd594159ea5d700
Chong Zhang [Thu, 1 Sep 2016 00:46:00 +0000 (00:46 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev
am:
dc02317d92
Change-Id: I5ad4e2a8f96e32a79eb95603ad9dba3d672feb62
Chong Zhang [Thu, 1 Sep 2016 00:45:58 +0000 (00:45 +0000)]
Do not log surface destroy by default
am:
ad23b3fa11
Change-Id: I91303c5855ac0733a1de0c303236070d87089b85
TreeHugger Robot [Thu, 1 Sep 2016 00:39:34 +0000 (00:39 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev
Bill Yi [Thu, 1 Sep 2016 00:39:29 +0000 (17:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc9731f1890dc6d9b46e09e6f2752c23e0f5c110
Auto-generated-cl: translation import
Pablo Ceballos [Thu, 1 Sep 2016 00:23:24 +0000 (00:23 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev am:
9103680158
am:
e584593641
Change-Id: I6f36890fc8cb7ae5f1839199279fd76158c75c3e
Pablo Ceballos [Thu, 1 Sep 2016 00:23:21 +0000 (00:23 +0000)]
Handle null Surface in createVirtualDisplay am:
eb3370d490
am:
b7d3f5b63b
Change-Id: I2c94542234bed20440dc5b927e1f27de47cf44d5
Pablo Ceballos [Thu, 1 Sep 2016 00:16:46 +0000 (00:16 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev
am:
9103680158
Change-Id: Ife70ed600ed008839af4ff024afa26920817d6a7
Pablo Ceballos [Thu, 1 Sep 2016 00:16:42 +0000 (00:16 +0000)]
Handle null Surface in createVirtualDisplay
am:
eb3370d490
Change-Id: I8af2a4356c2ea857affb047c946a5656f6c144f6
Pablo Ceballos [Thu, 1 Sep 2016 00:06:30 +0000 (00:06 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev
Mitchell Wills [Wed, 31 Aug 2016 23:56:13 +0000 (23:56 +0000)]
Merge changes I21fc6802,I8839c6cc
* changes:
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
Revert "DO NOT MERGE Revert "Add WiFi toggle prompts - framework""
Sudheer Shanka [Wed, 31 Aug 2016 23:50:28 +0000 (23:50 +0000)]
Merge "Allow package verifier and uninstaller to do silent uninstalls." into nyc-mr1-dev am:
0b69970e36
am:
608d4d8a46
Change-Id: I6f4bca57fe879f69626ca2b16d63ea2d7f20f295
sergeyv [Wed, 31 Aug 2016 23:50:27 +0000 (23:50 +0000)]
Merge "TextureView: clean up displaylists" into nyc-mr1-dev am:
c0e2e0ad62 am:
b6ef43e3df
am:
502a788007
Change-Id: Idc45ef565fd405c07f3c0174ea103c2c5cc58790
Sudheer Shanka [Wed, 31 Aug 2016 23:47:46 +0000 (23:47 +0000)]
Allow package verifier and uninstaller to do silent uninstalls. am:
bf6154a5ba
am:
51b6b7d507
Change-Id: I4443dcf82d9a40d0051618b65175018489e1dba2
Jeff Sharkey [Wed, 31 Aug 2016 23:47:42 +0000 (23:47 +0000)]
Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev am:
c081d2b870
am:
8215d988eb
Change-Id: Ia55bb188f420fca11dadcc940505d297a0a5f16d
Jeff Sharkey [Wed, 31 Aug 2016 23:47:39 +0000 (23:47 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE. am:
6ed7418228
am:
b1123e7871
Change-Id: Ie1d13350e15e3bf5bb41d16b6960b55ebb8d966b
Jeff Sharkey [Wed, 31 Aug 2016 23:47:35 +0000 (23:47 +0000)]
Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev am:
26887dc880
am:
444af99af6
Change-Id: Ie3a8bfbcb88190aba2402a43e86bafafcc51aae1
sergeyv [Wed, 31 Aug 2016 23:47:32 +0000 (23:47 +0000)]
TextureView: clean up displaylists am:
17dd01b693 am:
ac2ca87e92
am:
bb37b7b613
Change-Id: I12252ddc60ad7f52fe1604ac84042a759b8373c4
Jeff Sharkey [Wed, 31 Aug 2016 23:47:31 +0000 (23:47 +0000)]
DO NOT MERGE. Update lockscreen message when user unlocked. am:
99e1bca91a
am:
be4949f489
Change-Id: Ic44fb8c9ce8462e24891c72ddbb265f494b6d4f1
Jorim Jaggi [Wed, 31 Aug 2016 23:47:28 +0000 (23:47 +0000)]
Merge "Fix bug that apps are not unminimizing if recent tasks are empty" into nyc-mr1-dev am:
c8cccdcbd3 am:
f82699af88
am:
1cf9ce87bf
Change-Id: Iddcf59dc8a0829869f2210ba92374e002a17fb25
Jorim Jaggi [Wed, 31 Aug 2016 23:47:25 +0000 (23:47 +0000)]
Fix bug that apps are not unminimizing if recent tasks are empty am:
936aaeb878 am:
c037bb26cb
am:
fbe9038d39
Change-Id: I9e67340012a828cb53a0ee64ad61fe6af2c5b904
Adam Seaton [Wed, 31 Aug 2016 23:47:20 +0000 (23:47 +0000)]
Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit
8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am:
b57e6560d0 am:
e245037327 am:
1ceb0fcf3a am:
cb3c7d3b0e am:
c37d7a4756
am:
9cb5aa97fa
Change-Id: I9563834d6f9436f6624a14590e323be32462be8a
Adam Seaton [Wed, 31 Aug 2016 23:47:16 +0000 (23:47 +0000)]
Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit
8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. am:
b57e6560d0 am:
e245037327 am:
f11acea915
am:
8aa8342ee0
Change-Id: Id2a6f65eaffd27f99f41cdacb428b0c81b63be33
Jason Monk [Wed, 31 Aug 2016 23:40:40 +0000 (23:40 +0000)]
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev am:
a845535045 am:
f06c51a3ea
am:
b98ca8b4cc -s ours
Change-Id: I2de35cf940a820846de895e98e3d83a65363259d
Jason Monk [Wed, 31 Aug 2016 23:40:37 +0000 (23:40 +0000)]
Backup system QS tiles DO NOT MERGE am:
37bd2be160 am:
297d238130
am:
14af5da90f -s ours
Change-Id: Icb5c2445ea6eb033a7aa0bb30348f4d14ff91611
Jason Monk [Wed, 31 Aug 2016 23:40:31 +0000 (23:40 +0000)]
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev am:
a845535045 am:
697551f1cc am:
65370c7509 am:
e14c73cc17
am:
bed36cb1d3 -s ours
Change-Id: I4d6d6fd120840a9a6dbbdbf5f540c09443739c0f
Jason Monk [Wed, 31 Aug 2016 23:40:26 +0000 (23:40 +0000)]
Backup system QS tiles DO NOT MERGE am:
37bd2be160 -s ours am:
f6a168f728 am:
261c64af9a am:
5619f0d6fc
am:
86f35fec3b -s ours
Change-Id: I09168f0a879f479507d0922f127bc414e586c9bf
Jorim Jaggi [Wed, 31 Aug 2016 23:40:21 +0000 (23:40 +0000)]
Merge "Revert "Fix flicker while booting"" into nyc-mr1-dev am:
94b976a8c2 am:
edb092c6f7
am:
217cea2ab8
Change-Id: Ie179b3f3cbf00a8859bf3e5125759ff18fb81c5c
Jorim Jaggi [Wed, 31 Aug 2016 23:36:02 +0000 (23:36 +0000)]
Revert "Fix flicker while booting" am:
ba5339d5d6 am:
6a032cca07
am:
2cfc4f61f9
Change-Id: I2e948345e57725dab6d64d6dabf3f5c08056207d
OSDN Git Service
