OSDN Git Service
TreeHugger Robot [Thu, 7 Jun 2018 21:42:59 +0000 (21:42 +0000)]
Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 21:33:59 +0000 (21:33 +0000)]
Merge "Camera: update tonemap image in html doc" into pi-dev
Jaewan Kim [Thu, 7 Jun 2018 21:19:03 +0000 (21:19 +0000)]
Merge "MediaSessionService: Fix NPE" into pi-dev
Yao Chen [Thu, 7 Jun 2018 21:10:16 +0000 (21:10 +0000)]
Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 20:40:33 +0000 (20:40 +0000)]
Merge "Hide backdrop when waking up from fp" into pi-dev
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:12:43 +0000 (20:12 +0000)]
Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev
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
TreeHugger Robot [Thu, 7 Jun 2018 19:11:12 +0000 (19:11 +0000)]
Merge "One more light grey addition." into pi-dev
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
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
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:04:16 +0000 (18:04 +0000)]
Merge "docs: Changed language to be gender-neutral." into pi-dev
Yin-Chia Yeh [Thu, 15 Mar 2018 18:28:20 +0000 (11:28 -0700)]
Camera: update tonemap image in html doc
Bug:
74942037
Merged-In: I6ac4bd9e7a6d9bb2b8e3d1303656c0cdc525178b
Change-Id: I6ac4bd9e7a6d9bb2b8e3d1303656c0cdc525178b
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
Nicolas Geoffray [Thu, 7 Jun 2018 17:14:20 +0000 (17:14 +0000)]
Merge "Add more light grey APIs." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 16:56:25 +0000 (16:56 +0000)]
Merge "Start SecurityLogMonitor after broadcasts are allowed." into pi-dev
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:15:57 +0000 (16:15 +0000)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
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: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:14:03 +0000 (14:14 +0000)]
Merge "O no, this should be a P." into pi-dev
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 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
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
Jaewan Kim [Thu, 7 Jun 2018 01:16:22 +0000 (10:16 +0900)]
MediaSessionService: Fix NPE
Bug:
109766690
Test: Run CtsMediaTests
Change-Id: Id94bc1a4c46a28f920b10e39c0ada7ad6a90fc01
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
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
Yao Chen [Tue, 5 Jun 2018 21:20:35 +0000 (14:20 -0700)]
Disable statsd and make StatsLog no-op if ro.statsd.enable=false
Bug:
79324611
Test: manually tested on marlin_svelte
Change-Id: Ic7fbf86d7c295cb6b2f20e7f9a957d1ed74c42c0
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
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
TreeHugger Robot [Wed, 6 Jun 2018 23:06:28 +0000 (23:06 +0000)]
Merge "Minor autofill logging improvements." into pi-dev
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
TreeHugger Robot [Wed, 6 Jun 2018 22:16:36 +0000 (22:16 +0000)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
Aarthi Balachander [Tue, 5 Jun 2018 23:10:38 +0000 (16:10 -0700)]
Show the bouncer at start up if the headless user flag is set
Test: Mojave
Bug:
79581497
Change-Id: I5bb4a3aa0ddf7c2eda925975976cf2e81076d68a
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
TreeHugger Robot [Wed, 6 Jun 2018 21:21:37 +0000 (21:21 +0000)]
Merge "Status bar etc dots 4dp" into pi-dev
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
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
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
Lucas Dupin [Wed, 6 Jun 2018 18:42:55 +0000 (11:42 -0700)]
Update scrims when keyguard gets occluded
We were assuming that a show_when_locked window would always be on
the lock screen when the device sleeps, but its possible that,
when charging, a window may come visible after the device enters
doze.
Ideally this should be handled in window manager but not feasible
in P.
Change-Id: I8a1b5e638a8e84bbea3a91fc4ac94feb6195390e
Fixes:
80647623
Test: manual with app from play store
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
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
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
Mihai Popa [Wed, 6 Jun 2018 16:33:57 +0000 (09:33 -0700)]
[automerger skipped] Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev
am:
3fce74a7f3 -s ours
Change-Id: I28ae4102fd8913d74e8dd928f286cbdbd66d0241
TreeHugger Robot [Wed, 6 Jun 2018 16:28:23 +0000 (16:28 +0000)]
Merge "Use correct attribute name." into pi-dev
Android Build Merger (Role) [Wed, 6 Jun 2018 16:28:11 +0000 (16:28 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b am:
83d9688077
Change-Id: I2e91e2573efec1a54eef83a93dfc7b99f20cda7b
Android Build Merger (Role) [Wed, 6 Jun 2018 16:28:04 +0000 (16:28 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887 am:
ea648c6a2b
Change-Id: I0f2860081d8a65d239d0beba1499bb69c3527c2c
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:57 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af am:
c62d510887
Change-Id: I0e91789c55c400c15315c51e0f99f3a44ed2d913
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:50 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af
Change-Id: If7742e7a94602f120b1ec1db9ff763998adae344
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:43 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540
Change-Id: I3b08cf27f6407fdf5789f8a49c3b3aa49f1c1ecd
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:30 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93
Change-Id: I23ca86e3bf3df6684d88f1be575f2be1599ac9eb
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:24 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6
Change-Id: Ida4ae11d778115fb1f0d373523f71845fff88331
Jean-Michel Trivi [Wed, 6 Jun 2018 16:25:09 +0000 (16:25 +0000)]
Merge "AudioRecord JNI: fix mem leak on audio_attributes_t" into pi-dev
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into oc-dev
* changes:
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775 skipped:
94bc67f03c
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c
Optimise the hit test algorithm
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into nyc-mr2-dev
* changes:
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89 am:
f5d69aa775
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932 am:
a72cb45f89
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c
Optimise the hit test algorithm