OSDN Git Service
shawnlin [Thu, 7 Jun 2018 21:04:56 +0000 (14:04 -0700)]
Merge "Fixed flickering when quick tap on brightness bar" into pi-dev
am:
0631de5772
Change-Id: Ifbdc6e0060a4e8371c5cd4592ca7d2a1cf755b42
TreeHugger Robot [Thu, 7 Jun 2018 20:28:36 +0000 (20:28 +0000)]
Merge "Fixed flickering when quick tap on brightness bar" into pi-dev
Benjamin Miller [Thu, 7 Jun 2018 20:25:16 +0000 (13:25 -0700)]
Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev
am:
d97f38f69c
Change-Id: Icb22a68fe4402434a4dfae1856fade5219f461fc
Nicolas Geoffray [Thu, 7 Jun 2018 20:17:33 +0000 (13:17 -0700)]
Merge "Add more APIs to light grey list" into pi-dev
am:
208c0ad30f
Change-Id: Ice5238aa16fa7864f86f985ed27af7ad00feaf70
Benjamin Miller [Thu, 7 Jun 2018 20:12:43 +0000 (20:12 +0000)]
Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev
Chad Brubaker [Thu, 7 Jun 2018 20:10:48 +0000 (13:10 -0700)]
Merge "Do not preload NoPreloadHolder classes" into pi-dev
am:
1af8b4d1f4
Change-Id: I116643925a3a9594e8590c3714e93d0fb0ac372f
Nicolas Geoffray [Thu, 7 Jun 2018 20:03:42 +0000 (20:03 +0000)]
Merge "Add more APIs to light grey list" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 19:48:14 +0000 (19:48 +0000)]
Merge "Do not preload NoPreloadHolder classes" into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 19:48:03 +0000 (12:48 -0700)]
Merge "One more light grey addition." into pi-dev
am:
ff207fdf86
Change-Id: Ife2f2bc3c8bb75a5a3e423820a703ff49607d6ec
Android Build Merger (Role) [Thu, 7 Jun 2018 19:43:49 +0000 (19:43 +0000)]
Merge "[automerger skipped] Merge "Add GTS test APIs for testing ImsService" am:
5a6df1afa7 am:
1946960f9a -s ours" into pi-dev-plus-aosp
Winson Chung [Thu, 7 Jun 2018 19:42:09 +0000 (12:42 -0700)]
Merge "Consider window background opacity when determining snapshot translucency" into pi-dev
am:
c6e4acc222
Change-Id: I53f7b22ab35979d7bf0933e59985b35e0127c717
Brad Ebinger [Thu, 7 Jun 2018 19:41:36 +0000 (12:41 -0700)]
[automerger skipped] Merge "Add GTS test APIs for testing ImsService" am:
5a6df1afa7
am:
1946960f9a -s ours
Change-Id: Ic5e5d18b86fbf3badc7d6497921edb17531f5d1b
TreeHugger Robot [Thu, 7 Jun 2018 19:11:12 +0000 (19:11 +0000)]
Merge "One more light grey addition." into pi-dev
Neil Fuller [Thu, 7 Jun 2018 19:02:59 +0000 (20:02 +0100)]
resolve merge conflicts of
26119befba89e1d656e6c2237f15e2b3a74865fd to pi-dev-plus-aosp
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iea64af5a88c9bf399fb26468e931be3c73061bac
Winson Chung [Thu, 7 Jun 2018 18:59:48 +0000 (18:59 +0000)]
Merge "Consider window background opacity when determining snapshot translucency" into pi-dev
Brad Ebinger [Thu, 7 Jun 2018 18:57:18 +0000 (11:57 -0700)]
Merge "Add GTS test APIs for testing ImsService"
am:
5a6df1afa7
Change-Id: Ie7b3eca14fce98be4f78fc95aac4795d7ea730fc
Chad Brubaker [Thu, 7 Jun 2018 18:40:57 +0000 (11:40 -0700)]
Do not preload NoPreloadHolder classes
These classes cannot be statically preloaded in Zygote.
Change-Id: I7d9f10e634409bedfdd71f8daa43b8e23516638e
Fixes:
109652611
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testCaCertManagement
Winson Chung [Thu, 7 Jun 2018 18:45:22 +0000 (11:45 -0700)]
Merge "Only use the pre-animation bounds when an animation is running and is set" into pi-dev
am:
5d4678e992
Change-Id: Ifebe6be3f86ae614c4d48b7a6d84ec9dbfded9ac
TreeHugger Robot [Thu, 7 Jun 2018 18:25:14 +0000 (18:25 +0000)]
Merge "Only use the pre-animation bounds when an animation is running and is set" into pi-dev
Laura Davis [Thu, 7 Jun 2018 18:24:38 +0000 (11:24 -0700)]
Merge "docs: Changed language to be gender-neutral." into pi-dev
am:
b6e3e61850
Change-Id: I3a4769d6722be078a32623e3f94623108aa779c5
Laura Davis [Thu, 7 Jun 2018 18:04:16 +0000 (18:04 +0000)]
Merge "docs: Changed language to be gender-neutral." into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 17:27:51 +0000 (10:27 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
ac013ae464
Change-Id: Iad4482a81d775fad58df38f27a4fff2395e53510
Nicolas Geoffray [Thu, 7 Jun 2018 17:23:21 +0000 (18:23 +0100)]
One more light grey addition.
bug:
109833930
Test: m
Change-Id: I0f2079e84827f1ee6425e5a73a135d2401a78443
Pavel Grafov [Thu, 7 Jun 2018 17:19:50 +0000 (10:19 -0700)]
Merge "Start SecurityLogMonitor after broadcasts are allowed." into pi-dev
am:
8e0ad6534d
Change-Id: I4189fac8b4d791fd1fa8b4886e3ff4f7962e1b06
Lucas Dupin [Thu, 7 Jun 2018 17:14:36 +0000 (10:14 -0700)]
Merge "Update scrims when keyguard gets occluded" into pi-dev
am:
cc4efe08de
Change-Id: Iaa8fa466561a962d2a0264e40309492e1d5d55d8
Nicolas Geoffray [Thu, 7 Jun 2018 17:14:20 +0000 (17:14 +0000)]
Merge "Add more light grey APIs." into pi-dev
Yi Jin [Thu, 7 Jun 2018 17:06:13 +0000 (10:06 -0700)]
Merge "Fix cts." into pi-dev
am:
3e389a8490
Change-Id: I9d9ddb90f8917904187a022e27a7139e61276c75
Brad Ebinger [Thu, 7 Jun 2018 17:03:28 +0000 (17:03 +0000)]
Merge "Add GTS test APIs for testing ImsService"
TreeHugger Robot [Thu, 7 Jun 2018 16:56:25 +0000 (16:56 +0000)]
Merge "Start SecurityLogMonitor after broadcasts are allowed." into pi-dev
Neil Fuller [Thu, 7 Jun 2018 16:52:48 +0000 (09:52 -0700)]
Merge "Remove CommonClock / CommonTimeManagementService"
am:
72072cd769
Change-Id: I3146a6da8f3fbecc19b344b077e43b5d3e734041
TreeHugger Robot [Thu, 7 Jun 2018 16:50:34 +0000 (16:50 +0000)]
Merge "Update scrims when keyguard gets occluded" into pi-dev
Yi Jin [Thu, 7 Jun 2018 16:48:20 +0000 (16:48 +0000)]
Merge "Fix cts." into pi-dev
Andrew Sapperstein [Thu, 7 Jun 2018 16:36:29 +0000 (09:36 -0700)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
am:
bae9b1a71c
Change-Id: I75e88cc0905cb90412609f9a14627e6fa7963a27
Andrew Sapperstein [Thu, 7 Jun 2018 16:15:57 +0000 (16:15 +0000)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
Neil Fuller [Thu, 7 Jun 2018 15:50:06 +0000 (15:50 +0000)]
Merge "Remove CommonClock / CommonTimeManagementService"
David Brazdil [Thu, 7 Jun 2018 15:32:41 +0000 (16:32 +0100)]
Add more APIs to light grey list
Bug:
109869624
Test: m
Change-Id: I3490b8cfba60f0be0c3d464b581ccca637af0549
Nicolas Geoffray [Thu, 7 Jun 2018 15:29:58 +0000 (08:29 -0700)]
Merge "Manual update from a bugbot hidden API comment." into pi-dev
am:
cc2cbe8dc8
Change-Id: Ic4fde8029719856ca964707104a296a91e41de0d
Nicolas Geoffray [Thu, 7 Jun 2018 15:18:24 +0000 (15:18 +0000)]
Merge "Manual update from a bugbot hidden API comment." into pi-dev
Daniel Sandler [Thu, 7 Jun 2018 14:23:26 +0000 (07:23 -0700)]
Merge "O no, this should be a P." into pi-dev
am:
31cb11324f
Change-Id: I3dadcd2ff2bd13bb125762735d0d72810fc551d5
Daniel Sandler [Thu, 7 Jun 2018 14:14:03 +0000 (14:14 +0000)]
Merge "O no, this should be a P." into pi-dev
Sundong Ahn [Thu, 7 Jun 2018 13:36:36 +0000 (06:36 -0700)]
[automerger skipped] Merge "com.android.mediadrm.signer is built with java_sdk_library" am:
c55e1b6f4d
am:
5a16c39891 -s ours
Change-Id: I0f551979e3e7b0dd98de0da06965cac165c9be94
Sundong Ahn [Thu, 7 Jun 2018 12:43:38 +0000 (05:43 -0700)]
Merge "com.android.mediadrm.signer is built with java_sdk_library"
am:
c55e1b6f4d
Change-Id: I33dec56812e9207a3b60efbb8001c93bb67c5349
Treehugger Robot [Thu, 7 Jun 2018 11:27:25 +0000 (11:27 +0000)]
Merge "com.android.mediadrm.signer is built with java_sdk_library"
Nicolas Geoffray [Thu, 7 Jun 2018 10:50:02 +0000 (11:50 +0100)]
Manual update from a bugbot hidden API comment.
bug:
109761368
Test: m
Change-Id: I65cda12a0c4e48c888d3b08f63f9412b88ac248a
Nicolas Geoffray [Thu, 7 Jun 2018 08:01:23 +0000 (09:01 +0100)]
Add more light grey APIs.
bug:
109841601
Test: m
Change-Id: I6f43c718a35a534f1b675cc116f2642e6a5b8a18
Merged-in: I6f43c718a35a534f1b675cc116f2642e6a5b8a18
Pavel Grafov [Wed, 6 Jun 2018 15:11:09 +0000 (16:11 +0100)]
Start SecurityLogMonitor after broadcasts are allowed.
Otherwise if boot takes long enough, DO broadcast will be sent while
ActivityManagerSerivce is not ready, causing IllegalStateException.
Change-Id: I6b55ed45ed7b1f3ed9ad6ec20695907b4fa6f3b1
Fixes:
109746888
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.DeviceOwnerTest#testSecurityLoggingWithSingleUser
Test: provisioned TestDPC as DO in SuW, enabled logging.
Ryan Mitchell [Thu, 7 Jun 2018 06:08:05 +0000 (23:08 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours am:
35dfd46378 -s ours
am:
a76360ddf1 -s ours
Change-Id: I9487f439cf725b856c865dc29629f25814f51c29
Ryan Mitchell [Thu, 7 Jun 2018 05:53:12 +0000 (22:53 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8 am:
366031e336
am:
5dcf0e0f65
Change-Id: Iaec794eef67f37b4d9e9d5401bea435562ccec29
Ryan Mitchell [Thu, 7 Jun 2018 05:24:04 +0000 (22:24 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours
am:
35dfd46378 -s ours
Change-Id: Icc7661bca07e16f0b230b35ab7f1df8f0d8a8189
Dan Sandler [Thu, 7 Jun 2018 05:08:34 +0000 (01:08 -0400)]
O no, this should be a P.
Bug:
109804872
Test: none
Change-Id: Ibd6aac069a254a7d5a190e1f4476ba2c4124a758
Ryan Mitchell [Thu, 7 Jun 2018 04:26:05 +0000 (21:26 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8
am:
366031e336
Change-Id: I815ba23c884d6891b2acba23687db0d4d1cab98a
Ryan Mitchell [Thu, 7 Jun 2018 04:19:51 +0000 (21:19 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac
am:
53ff808f99 -s ours
Change-Id: Ia9736d803a7b980bafb5b55d76c99a7ee29c68c3
Ryan Mitchell [Thu, 7 Jun 2018 03:49:18 +0000 (20:49 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8
am:
dff068e1e8
Change-Id: I562e53f089ca19fc145a34fb539556ae92d05722
Felipe Leme [Thu, 7 Jun 2018 02:55:38 +0000 (19:55 -0700)]
Merge "Document -n option on intent specification." into pi-dev
am:
39f04a7da4
Change-Id: Id8b23acedbd9fe3eb73438b1397a6ff80d36c267
Winson Chung [Thu, 7 Jun 2018 02:50:23 +0000 (19:50 -0700)]
Merge "Skip finishing menu activity when dismissing PiP" into pi-dev
am:
fc16950683
Change-Id: I2745a8ab3e22a49975bc0311ef8bf7bfc5e109e9
Winson Chung [Mon, 4 Jun 2018 23:40:09 +0000 (16:40 -0700)]
Consider window background opacity when determining snapshot translucency
Bug:
80536978
Test: Open WhatsApp conversation with IME open, hit home, go to Overview
Change-Id: I14cb15a15c2dc43229c927eda4bad3d61e568622
shawnlin [Mon, 28 May 2018 08:29:08 +0000 (16:29 +0800)]
Fixed flickering when quick tap on brightness bar
Reduce the height of brightness mirror view.
Change-Id: I998932dea51659cbba0a8484973b3281f595c46e
Fixes:
79927315
Test: quick tap on brightness bar and observe the result
Test: atest google/perf/jank/SystemUI/UbSystemUIJankTests-Trace:android.platform.systemui.tests.jank.SystemUiJankTests#testChangeBrightness
Winson Chung [Wed, 6 Jun 2018 16:34:23 +0000 (09:34 -0700)]
Only use the pre-animation bounds when an animation is running and is set
- Fix issue with NaN being calculated as the saved fraction due to the wrong
bounds being used
Bug:
109841835
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerPinnedStackTests
Test: Repeatedly launch pip into fullscreen landscape app, and ensure that
the saved snapfraction is calculated correctly
Change-Id: I9b442cda636121164af1f3e66050894d06518439
Ryan Mitchell [Thu, 7 Jun 2018 01:53:39 +0000 (18:53 -0700)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
am:
2d31069fac
Change-Id: I282ef1b63da084bb0906bee79ec5a7b0e9e66a2c
Ryan Mitchell [Thu, 7 Jun 2018 01:30:51 +0000 (18:30 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev
am:
075bcf73c8
Change-Id: I926986b532e52b423555f9fb6540ccfe50eee075
TreeHugger Robot [Thu, 7 Jun 2018 01:20:04 +0000 (01:20 +0000)]
Merge "com.android.mediadrm.signer is built with java_sdk_library" into pi-dev-plus-aosp
Yi Jin [Thu, 7 Jun 2018 01:08:01 +0000 (18:08 -0700)]
Fix cts.
Bug:
109837886
Test: atest CtsIncidentHostTestCases:com.android.server.cts.IncidentdTest
Change-Id: I8cfc36b652fff4b7b4d752f57fba922ac479cd12
TreeHugger Robot [Thu, 7 Jun 2018 00:36:10 +0000 (00:36 +0000)]
Merge "Document -n option on intent specification." into pi-dev
Winson Chung [Thu, 7 Jun 2018 00:35:54 +0000 (00:35 +0000)]
Merge "Skip finishing menu activity when dismissing PiP" into pi-dev
Amith Yamasani [Wed, 6 Jun 2018 23:54:49 +0000 (16:54 -0700)]
Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
am:
9f1885dee8
Change-Id: Idb0ba52a58231ce9ede97b158a1cb38d1a9633ae
TreeHugger Robot [Wed, 6 Jun 2018 23:35:13 +0000 (23:35 +0000)]
Merge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
Android Build Merger (Role) [Wed, 6 Jun 2018 23:34:19 +0000 (23:34 +0000)]
Merge "Merge "Ensure self-managed calls use voip audio mode." am:
b62aa315d1 am:
fd3e10b1bc" into pi-dev-plus-aosp
Tyler Gunn [Wed, 6 Jun 2018 23:33:19 +0000 (16:33 -0700)]
Merge "Ensure self-managed calls use voip audio mode." am:
b62aa315d1
am:
fd3e10b1bc
Change-Id: I8f7842fa84fcce91a292b32189cd827b4a125fb0
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f am:
648a950ce9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Felipe Leme [Wed, 6 Jun 2018 23:29:57 +0000 (16:29 -0700)]
Merge "Minor autofill logging improvements." into pi-dev
am:
125c19a2f5
Change-Id: I4dca54b82b83f0b710aec84fd9982741b6074660
Nan Zhang [Wed, 6 Jun 2018 23:24:59 +0000 (16:24 -0700)]
[automerger skipped] Merge "Add metalava-api-stubs targets" into pi-dev
am:
a08d1ffbb7 -s ours
Change-Id: I94771fe7b2726a1dd0cf53b10e0446abaeaa948c
Nan Zhang [Wed, 6 Jun 2018 23:17:13 +0000 (16:17 -0700)]
[automerger skipped] Add metalava-api-stubs targets
am:
bd9eda5094 -s ours
Change-Id: I886b50c76c344d13db8464a7406e19efc4b72335
Ryan Mitchell [Wed, 6 Jun 2018 23:09:35 +0000 (16:09 -0700)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev am:
2b6805fedc
am:
5ae85666ac
Change-Id: I64521a290482adb5ade95b641ce9c0c27031a814
TreeHugger Robot [Wed, 6 Jun 2018 23:06:28 +0000 (23:06 +0000)]
Merge "Minor autofill logging improvements." into pi-dev
Tyler Gunn [Wed, 6 Jun 2018 23:03:46 +0000 (16:03 -0700)]
Merge "Ensure self-managed calls use voip audio mode."
am:
b62aa315d1
Change-Id: I262357c1aa9a23270edc2f1b1df409840fbf626d
Mihai Popa [Wed, 6 Jun 2018 23:03:45 +0000 (16:03 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours am:
ac169beb52 -s ours am:
4ae55000b2 -s ours
am:
c69da1474a -s ours
Change-Id: I74d2a2cc21fe6978d9a9bda401bdf0f35e1fefe9
Nan Zhang [Wed, 6 Jun 2018 23:01:51 +0000 (23:01 +0000)]
Merge "Add metalava-api-stubs targets" into pi-dev
Ryan Mitchell [Wed, 6 Jun 2018 22:50:57 +0000 (15:50 -0700)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
am:
2b6805fedc
Change-Id: I5ef0a789b16dc8aa0936d8fcca3917ce2f884d74
Mihai Popa [Wed, 6 Jun 2018 22:46:03 +0000 (15:46 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours am:
ac169beb52 -s ours
am:
4ae55000b2 -s ours
Change-Id: I16b4f8d33496eb6f7770a56c1907aab0a69da0ae
Evan Laird [Wed, 6 Jun 2018 22:44:20 +0000 (15:44 -0700)]
Merge "Status bar etc dots 4dp" into pi-dev
am:
d54c3a3036
Change-Id: I49514e9213e36ff5d3138c0b352af4be9b370282
Dieter Hsu [Wed, 6 Jun 2018 22:37:21 +0000 (15:37 -0700)]
Merge "Update notifications on density or font size change for current user" into pi-dev
am:
1394b342e3
Change-Id: I913e56f9da1676df6ce78e18fc9a47cca101e481
Brad Ebinger [Tue, 3 Apr 2018 22:16:38 +0000 (15:16 -0700)]
Add GTS test APIs for testing ImsService
Bug:
77141737
Test: Manual
Merged-In: Id60cf07121cf98ab3f0a10af10cf70beb25feb54
Change-Id: Ia41a96b5013bc6a7f534c347db72a14348c1fc5d
Lucas Dupin [Wed, 6 Jun 2018 22:24:17 +0000 (15:24 -0700)]
Merge "Always cancel clock animation" into pi-dev
am:
a1cb973366
Change-Id: I20406102b51c0dcbbd4a1fc122b89f98e2412607
TreeHugger Robot [Wed, 6 Jun 2018 22:16:36 +0000 (22:16 +0000)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233 am:
c51c6751d7
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030 am:
a659d7c233
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983 am:
ad43c89030
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
Chavi Weingarten [Wed, 6 Jun 2018 22:09:19 +0000 (15:09 -0700)]
Merge "Prevent IME from showing when AOD shown or windows not drawn." into pi-dev
am:
cf5514257f
Change-Id: I0bc09f864a5971eca059bdf559d91793bb9bba08
Emilian Peev [Wed, 6 Jun 2018 21:51:26 +0000 (14:51 -0700)]
Merge "media: Check window connect status in ImageWriter" into pi-dev
am:
596fea9581
Change-Id: If1fee999ef937e74bf4ac23380e27dbea231655a
TreeHugger Robot [Wed, 6 Jun 2018 21:21:37 +0000 (21:21 +0000)]
Merge "Status bar etc dots 4dp" into pi-dev
Winson Chung [Wed, 6 Jun 2018 21:19:43 +0000 (14:19 -0700)]
Merge "Fix PiP regression when the stack animation is canceled" into pi-dev
am:
19cfc1a754
Change-Id: I4a4a0edb7931770b1c36dff87397667592e4db19
Tyler Gunn [Wed, 6 Jun 2018 21:19:04 +0000 (21:19 +0000)]
Merge "Ensure self-managed calls use voip audio mode."
Rohan Shah [Wed, 6 Jun 2018 21:05:53 +0000 (14:05 -0700)]
Merge "[QS] Change Date font in QQS" into pi-dev
am:
c754707b76
Change-Id: I213e6b16ec15e5f93c46f810d7b0cf4cb3e17699
Tracy Zhou [Wed, 6 Jun 2018 20:54:54 +0000 (13:54 -0700)]
Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second user." into pi-dev
am:
dd12d33981
Change-Id: I5505d82dca3ba030793fc4fd483b18fa2a4b6be0
Mihai Popa [Wed, 6 Jun 2018 20:36:14 +0000 (13:36 -0700)]
[automerger skipped] [automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077 am:
ce1d540693 -s ours
am:
ac169beb52 -s ours
Change-Id: Iaba870a637bd42807578d5846a819e4bead5adb4
Nan Zhang [Wed, 6 Jun 2018 02:01:32 +0000 (19:01 -0700)]
Add metalava-api-stubs targets
Also removed --exact-api flag since Metalava has not supported it yet.
Test: Manually checked-in prebuilt metalava.jar to my local src tree and
compare the results between old and new docs/stubs generation.
Bug: b/
78245848
Change-Id: I863430a563a25370f2ad65c19984cab37f611c2e
Merged-In: Ie0943d306af4176d965425ec85236cd173c1e870
Sunny Goyal [Wed, 6 Jun 2018 20:30:25 +0000 (13:30 -0700)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev
am:
09dc071562
Change-Id: Ia42dfe2e058c9ea024b5a175d317b31a097f90cc
Bill Yi [Wed, 6 Jun 2018 20:11:47 +0000 (13:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6824fdb401 -s ours
Change-Id: If5d1795cb37afef412bec06959647fe0fb09c7e3
Selim Cinek [Wed, 6 Jun 2018 20:11:13 +0000 (13:11 -0700)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev
am:
a2537b7269
Change-Id: I0a2e1042bc288ab62ab5a7e2e13c9e51336b35f7
Bill Yi [Wed, 6 Jun 2018 19:56:10 +0000 (12:56 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
891fa6f6af -s ours
Change-Id: I894b8cfb60049b3725e006c4ea81f6a265b53e7b
Bill Yi [Wed, 6 Jun 2018 19:54:56 +0000 (12:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
d3e66495cd -s ours
Change-Id: Ifd03b185b954339ccf05166a8cf323aeb74e064c
Bill Yi [Wed, 6 Jun 2018 19:52:50 +0000 (12:52 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
158e38c3ed -s ours
Change-Id: Ib49818f0037ce9e7ca80d9e2244de3f7bad7b0f3
OSDN Git Service
