OSDN Git Service
Yi Jin [Thu, 7 Jun 2018 17:06:13 +0000 (10:06 -0700)]
Merge "Fix cts." into pi-dev
am:
3e389a8490
Change-Id: I9d9ddb90f8917904187a022e27a7139e61276c75
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
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
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
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
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
Amith Yamasani [Wed, 6 Jun 2018 17:48:03 +0000 (10:48 -0700)]
DO NOT MERGE Fix security exception due to incorrect flags
Caught by test UsageStatsTest due to stricter checks for
MATCH_ANY_USER.
Change-Id: Ie884c7007a8588a222773fba8d7967bcdf2a528a
Fixes:
109700742
Test: atest CtsUsageStatsTestCases:UsageStatsTest
TreeHugger Robot [Wed, 6 Jun 2018 19:51:15 +0000 (19:51 +0000)]
Merge "Update notifications on density or font size change for current user" into pi-dev
Nicolas Geoffray [Wed, 6 Jun 2018 19:50:53 +0000 (12:50 -0700)]
Merge "Light grey bugbot updates." into pi-dev
am:
bfa0ee12cf
Change-Id: I7f43dc0677b00234fa33f5e01ebdc330a7568f05
Mihai Popa [Wed, 6 Jun 2018 19:45:38 +0000 (12:45 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours am:
bb18c011aa -s ours am:
7478894a89 -s ours
am:
999d9e1bf0 -s ours
Change-Id: I92c4e0edf71e7f92400395af8aa2828bb9ab395f
Sanry Huang [Wed, 6 Jun 2018 17:34:34 +0000 (17:34 +0000)]
Revert "Hide system apps until installed (1/2)"
This reverts commit
40ede29ed6467d4d85a482e6008b92aa02d50267.
Bug:
74068582
Bug:
80444486
Bug:
80316870
Bug:
109803325
Bug:
109642189
Bug:
109660260
Bug:
109649585
Bug:
109647120
Bug:
109648512
Bug:
109648513
Bug:
109647122
Change-Id: I0e50ceebeaecae89f461f541450e24d9c148527d
TreeHugger Robot [Wed, 6 Jun 2018 19:21:19 +0000 (19:21 +0000)]
Merge "Always cancel clock animation" into pi-dev
Chavi Weingarten [Wed, 6 Jun 2018 18:56:56 +0000 (18:56 +0000)]
Merge "Prevent IME from showing when AOD shown or windows not drawn." into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:54:51 +0000 (18:54 +0000)]
Merge "media: Check window connect status in ImageWriter" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:50:52 +0000 (18:50 +0000)]
Merge "Fix PiP regression when the stack animation is canceled" into pi-dev
Rohan Shah [Wed, 6 Jun 2018 18:43:06 +0000 (18:43 +0000)]
Merge "[QS] Change Date font in QQS" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:30:15 +0000 (18:30 +0000)]
Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second user." into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:18:43 +0000 (18:18 +0000)]
Merge "Changing the recents component to point to launcher3 implementation" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:18:35 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Selim Cinek [Wed, 6 Jun 2018 18:18:27 +0000 (18:18 +0000)]
Merge "Fix exception from DateTimeView unregisters receiver again" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:13:55 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:13:27 +0000 (18:13 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Mihai Popa [Wed, 6 Jun 2018 18:09:15 +0000 (11:09 -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
Change-Id: Ic5ff6005483d4f4af1d0b9d8547c00751942fada
TreeHugger Robot [Wed, 6 Jun 2018 18:04:41 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Dieter Hsu [Wed, 6 Jun 2018 07:41:46 +0000 (15:41 +0800)]
Update notifications on density or font size change for current user
For created notifications, entry manager is not going to update entries
after changing the font scale and/or display density when shade is
disabled or other reasons.
To reinflate notifications for current user even filtered.
Fixes:
77728867
Test: manually restore backup with lots of apps and change font scale and/or display density
Test: atest SystemUITests:NotificationDataTest
Change-Id: I37fa38e73af1ebb672abd06282d10d7d928cc3a9
TreeHugger Robot [Wed, 6 Jun 2018 17:51:32 +0000 (17:51 +0000)]
Merge "Light grey bugbot updates." into pi-dev
Mihai Popa [Wed, 6 Jun 2018 17:42:20 +0000 (10:42 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours am:
bb18c011aa -s ours
am:
7478894a89 -s ours
Change-Id: I22992503b6a99f7002d0ce440d4fda9e313bcf73
Android Build Merger (Role) [Wed, 6 Jun 2018 17:13:15 +0000 (17:13 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f am:
648a950ce9
Change-Id: I313ac2c564ba5c8f094a37160d9ac5198f1d5aea
Android Build Merger (Role) [Wed, 6 Jun 2018 17:13:01 +0000 (17:13 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628 am:
c3aa2a4d3f
Change-Id: I2d0676d161e47b400d110c3239cdaaf002c72ec3
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:53 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a am:
c7e3991628
Change-Id: Ia7adde45bd85d2b3a56ede7215732cc05d97d870
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:46 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
Change-Id: I6e7ab766f6c88e61b8c2993a2f1420efc177319a
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:39 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
Change-Id: I43c9c68ca69d26f6d4d2dee3cd2a66d5e4a73761
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:24 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
Change-Id: Ib9e372290f9b2e1fa73470db3f7fd67bc9190711
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:18 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
Change-Id: I0556ef6fb1ceb02f4972c7434895cfeb5e13188d
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:11 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
Change-Id: I17fcbac2b6a7860749ddaabf6324cd89e3b78570
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:04 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Change-Id: I17682a41fbacafd30a032bd78b176a883bc7bdd8
Ryan Mitchell [Wed, 30 May 2018 19:17:01 +0000 (12:17 -0700)]
Fix DynamicRefTable::load security bug
DynamicRefTables parsed from apks are missing bounds checks that prevent
buffer overflows. This changes verifies the bounds of the header before
attempting to preform operations on the chunk.
Bug:
79488511
Test: run cts -m CtsAppSecurityHostTestCases \
-t android.appsecurity.cts.CorruptApkTests
Change-Id: I02c8ad957da244fce777ac68a482e4e8fa70f846
Merged-In: I02c8ad957da244fce777ac68a482e4e8fa70f846
Mihai Popa [Wed, 6 Jun 2018 17:01:16 +0000 (10:01 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev am:
3fce74a7f3 -s ours
am:
bb18c011aa -s ours
Change-Id: I2feb73ce9430daf5ead58675b552be326925af27
chaviw [Tue, 5 Jun 2018 23:29:13 +0000 (16:29 -0700)]
Prevent IME from showing when AOD shown or windows not drawn.
There's always been a possibility for IME to be visible even after the
screen was turned off. This was normally harmless because the IME was
placed behind the lock screen. The lock screen was opaque so it would
cover the IME, even in the case with AOD. However, with AOD live
wallpaper, the lock screen can now be transparent. This causes the IME
to be shown in between the wallpaper and lock screen.
To prevent IME from showing, several things needed to change.
1. The flag that was sent from sysui to AM is now propagated to WM. If
AOD is showing, IME should be hidden.
2. That flag sometimes is not a guarantee because AOD could be exiting,
but still shown on screen. Instead, also rely on the
mWindowManagerDrawComplete since that's only true when the windows have
completed drawing. The IME only needs to be shown if the other windows
on screen have drawn.
Test: Open IME and allow screen to timeout. When AOD turns on with
live wallpaper, IME is hidden.
Test: Within 5 seconds after AOD is turned on, turn screen on. Screen
turns on without IME flicker.
Fixes:
79658086
Change-Id: Ife93bdfde8ba2914930497356c0e16ebd629c507
Rebecca Silberstein [Wed, 6 Jun 2018 16:51:50 +0000 (09:51 -0700)]
Merge "WifiManager: add call to see if apband conversion is required" into pi-dev
am:
85bdd711ce
Change-Id: I4f2c8e9ebcfd4bb92cad23f222218960188ca09b
Julia Reynolds [Wed, 6 Jun 2018 16:46:23 +0000 (09:46 -0700)]
Merge "Use correct attribute name." into pi-dev
am:
65a411ac45
Change-Id: Ic2b5bcaa4637af3cb59c5b805e287a4c2ac6ee82
Jean-Michel Trivi [Wed, 6 Jun 2018 16:40:53 +0000 (09:40 -0700)]
Merge "AudioRecord JNI: fix mem leak on audio_attributes_t" into pi-dev
am:
2e73ff5e6f
Change-Id: I7290da47d3dd4efd56f986c7cc530bb10ec4e715
Tracy Zhou [Tue, 5 Jun 2018 19:09:14 +0000 (12:09 -0700)]
Fix "swipe up to switch apps" pop up displaying in SUW while creating
second user.
We unregister quickstep onboarding listeners when nav bar view is
detached. We also update its state when nav bar state changes, but we
are not updating it, while we should, update onboarding state when
disabled flags changes. In this scenario, it's triggered when the second
user is added.
Change-Id: I7da917f27fc0f0b8ae5e2d8262f2fdc331b4646d
Fixes:
80512560
Test: Manual test
Rebecca Silberstein [Wed, 6 Jun 2018 16:36:37 +0000 (16:36 +0000)]
Merge "WifiManager: add call to see if apband conversion is required" into pi-dev
OSDN Git Service
