OSDN Git Service

android-x86/frameworks-base.git
5 years agoMerge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 03:00:26 +0000 (03:00 +0000)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev

5 years agoMerge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet...
TreeHugger Robot [Fri, 8 Jun 2018 02:24:22 +0000 (02:24 +0000)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev

5 years agoMerge changes from topic "volume-change-flags" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 01:58:10 +0000 (01:58 +0000)]
Merge changes from topic "volume-change-flags" into pi-dev

* changes:
  Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
  Comply with the volume callback change

5 years agoOnly show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Lin Guo [Fri, 8 Jun 2018 00:08:30 +0000 (17:08 -0700)]
Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set

Bug: 109841417
Test: manual

Change-Id: Icc803a4b22ceccff7d3e788b9164975a8e395a3b

5 years agoChange Quick Settings to account for branded VPNs.
Anarghya Mitra [Thu, 7 Jun 2018 20:26:14 +0000 (13:26 -0700)]
Change Quick Settings to account for branded VPNs.

Screenshots: https://photos.app.goo.gl/FrnK69TXR86npFmY2
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs
Bug: 109837832
Change-Id: Ie447e6598ff593ff5d14ec8787db82ba39c9ea54

5 years agoMerge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
Yu-Han Yang [Thu, 7 Jun 2018 23:50:08 +0000 (23:50 +0000)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev

5 years agoRevert "Allow instant apps to send broadcasts to themselves"
Svetoslav Ganov [Thu, 7 Jun 2018 23:23:39 +0000 (23:23 +0000)]
Revert "Allow instant apps to send broadcasts to themselves"

This reverts commit 7b40358fa316038ce6a3243b8706c6f5b7a49536.

Reason for revert: False positive - this works and patch not needed.

bug:109583877

Change-Id: If708350b03292cfa3bf9841199739e06c82f6c4f

5 years agoComply with the volume callback change
Hongwei Wang [Thu, 7 Jun 2018 19:35:08 +0000 (12:35 -0700)]
Comply with the volume callback change

Bug: 109841417
Test: m -j
Change-Id: I43a139b97f89a666088db39579b068dc76babd56

5 years agoMerge "Remove usage of deprecated DayNightStyle values." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 22:23:12 +0000 (22:23 +0000)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev

5 years agoMerge "Move nulling of nextFrameCallback" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 22:14:51 +0000 (22:14 +0000)]
Merge "Move nulling of nextFrameCallback" into pi-dev

5 years agoMerge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 21:43:50 +0000 (21:43 +0000)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev

5 years agoMerge "Show the bouncer at start up if the headless user flag is set" into pi-dev
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

5 years agoMerge "Camera: update tonemap image in html doc" 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

5 years agoDocs: noted that setting proxy hostnames on an ApnSetting requires an internet connec...
Benjamin Miller [Thu, 7 Jun 2018 19:10:08 +0000 (19:10 +0000)]
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.

Doc-only change.
Also improved the class descriptions and fixed some typos.

Staged at:
  http://go/dac-stage/reference/android/telephony/data/ApnSetting_new
  http://go/dac-stage/reference/android/telephony/data/ApnSetting.Builder_new

Bug: 80238372
Test: make ds-docs with visual inspection of generated HTML
Change-Id: Id4a00c1a44dc3cbbaefc94c0438eb1a077f06e5e

5 years agoMerge "MediaSessionService: Fix NPE" into pi-dev
Jaewan Kim [Thu, 7 Jun 2018 21:19:03 +0000 (21:19 +0000)]
Merge "MediaSessionService: Fix NPE" into pi-dev

5 years agoMerge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" 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

5 years agoMerge "Hide backdrop when waking up from fp" 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

5 years agoMerge "Fixed flickering when quick tap on brightness bar" 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

5 years agoMerge "docs: Backup requestRestore() doesn't kill app during restore." 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

5 years agoMerge "Add more APIs to light grey list" 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

5 years agoDisable REQUEST_LOCATION from GNSS HAL by default
Yu-Han Yang [Thu, 7 Jun 2018 18:58:52 +0000 (11:58 -0700)]
Disable REQUEST_LOCATION from GNSS HAL by default

Bug: 109883154
Fixes: 109883154
Test: manually tested and verified it's disabled.
Change-Id: Ib42a14c776e32d20d79d8ce76a4acdbfa13a70a1

5 years agoMerge "Do not preload NoPreloadHolder classes" 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

5 years agoMerge "One more light grey addition." 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

5 years agoMerge "Consider window background opacity when determining snapshot translucency...
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

5 years agoDo not preload NoPreloadHolder classes
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

5 years agoMerge "Only use the pre-animation bounds when an animation is running and is set...
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

5 years agoMerge "docs: Changed language to be gender-neutral." 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

5 years agoCamera: update tonemap image in html doc
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

5 years agoOne more light grey addition.
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

5 years agoIncrease Binder Proxy Limit to 6000 for SYSTEM
Michael Wachenschwanz [Wed, 6 Jun 2018 22:04:22 +0000 (15:04 -0700)]
Increase Binder Proxy Limit to 6000 for SYSTEM

Workaround for issue with SysUi creating too many Binder Proxies.
Increasing the limit reduces the chance of a SysUi restart but increases the risk of a misbehaving app consuming system resources

Bug:109701487
Test: manual (generate 6000 Binder Proxies)
Change-Id: I11929cf41f9126bb095abb095c723dd892a51cb4

5 years agoMerge "Add more light grey APIs." into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 17:14:20 +0000 (17:14 +0000)]
Merge "Add more light grey APIs." into pi-dev

5 years agoMerge "Start SecurityLogMonitor after broadcasts are allowed." 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

5 years agoMerge "Update scrims when keyguard gets occluded" 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

5 years agoMerge "Fix cts." into pi-dev
Yi Jin [Thu, 7 Jun 2018 16:48:20 +0000 (16:48 +0000)]
Merge "Fix cts." into pi-dev

5 years agoMerge "Revert "Hide system apps until installed (1/2)"" 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

5 years agoAdd more APIs to light grey list
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

5 years agoMove nulling of nextFrameCallback
Jorim Jaggi [Wed, 6 Jun 2018 16:42:16 +0000 (18:42 +0200)]
Move nulling of nextFrameCallback

If draw() invokes postDraw that sets the next callback, the
callback will never be invoked.

Test: Long-swipe-up from navigation bar
Change-Id: If2e4dfff8a845b73fa77426305d5ece1921857e5
Fixes: 109701914

5 years agoMerge "Manual update from a bugbot hidden API comment." into pi-dev
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

5 years agoMerge "O no, this should be a P." 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

5 years agoManual update from a bugbot hidden API comment.
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

5 years agoAdd more light grey APIs.
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

5 years agoStart SecurityLogMonitor after broadcasts are allowed.
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.

5 years ago[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev...
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

5 years agoO no, this should be a P.
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

5 years agoMerge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev am...
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

5 years ago[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev...
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

5 years agoMerge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev am...
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

5 years agoConsider window background opacity when determining snapshot translucency
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

5 years agoFixed flickering when quick tap on brightness bar
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

5 years agoMediaSessionService: Fix NPE
Jaewan Kim [Thu, 7 Jun 2018 01:16:22 +0000 (10:16 +0900)]
MediaSessionService: Fix NPE

Bug: 109766690
Test: Run CtsMediaTests
Change-Id: Id94bc1a4c46a28f920b10e39c0ada7ad6a90fc01

5 years agoOnly use the pre-animation bounds when an animation is running and is set
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

5 years agoMerge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev
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

5 years agoMerge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev
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

5 years agoFix cts.
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

5 years agoMerge "Document -n option on intent specification." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 00:36:10 +0000 (00:36 +0000)]
Merge "Document -n option on intent specification." into pi-dev

5 years agoMerge "Skip finishing menu activity when dismissing PiP" 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

5 years agoDisable statsd and make StatsLog no-op if ro.statsd.enable=false
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

5 years agoMerge "DO NOT MERGE Fix security exception due to incorrect flags" into pi-dev
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

5 years agoMerge changes from topic "dynamic-ref-se-mnc-dev" into oc-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

5 years agoMerge "Minor autofill logging improvements." into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 23:06:28 +0000 (23:06 +0000)]
Merge "Minor autofill logging improvements." into pi-dev

5 years agoMerge "Add metalava-api-stubs targets" 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

5 years agoMerge "Fix DynamicRefTable::load security bug" into oc-mr1-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

5 years ago[automerger skipped] [automerger] Optimise the hit test algorithm am: 3b6f84b77c...
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

5 years agoMerge "Fix DynamicRefTable::load security bug" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Jun 2018 22:16:36 +0000 (22:16 +0000)]
Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev

5 years agoShow the bouncer at start up if the headless user flag is set
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

5 years agoMerge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-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

5 years agoMerge "Status bar etc dots 4dp" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 21:21:37 +0000 (21:21 +0000)]
Merge "Status bar etc dots 4dp" into pi-dev

5 years ago[automerger skipped] [automerger] Optimise the hit test algorithm am: 3b6f84b77c...
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

5 years agoAdd metalava-api-stubs targets
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

5 years agoDO NOT MERGE Fix security exception due to incorrect flags
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

5 years agoMerge "Update notifications on density or font size change for current user" into...
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

5 years agoRevert "Hide system apps until installed (1/2)"
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

5 years agoMerge "Always cancel clock animation" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 19:21:19 +0000 (19:21 +0000)]
Merge "Always cancel clock animation" into pi-dev

5 years agoMerge "Prevent IME from showing when AOD shown or windows not drawn." 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

5 years agoMerge "media: Check window connect status in ImageWriter" 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

5 years agoMerge "Fix PiP regression when the stack animation is canceled" 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

5 years agoMerge "[QS] Change Date font in QQS" 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

5 years agoUpdate scrims when keyguard gets occluded
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

5 years agoMerge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second...
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

5 years agoMerge "Changing the recents component to point to launcher3 implementation" into...
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

5 years agoMerge "Import translations. DO NOT MERGE" 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

5 years agoMerge "Fix exception from DateTimeView unregisters receiver again" 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

5 years agoMerge "Import translations. DO NOT MERGE" 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

5 years agoMerge "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

5 years ago[automerger skipped] [automerger] Optimise the hit test algorithm am: 3b6f84b77c...
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

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 18:04:41 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoUpdate notifications on density or font size change for current user
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

5 years agoMerge "Light grey bugbot updates." into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 17:51:32 +0000 (17:51 +0000)]
Merge "Light grey bugbot updates." into pi-dev

5 years ago[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00...
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce...
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0 am: d65dbf91ce
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

5 years ago[automerger] Fix DynamicRefTable::load security bug am: 8cf0f988b0
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

5 years agoFix DynamicRefTable::load security bug
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

5 years ago[automerger skipped] Merge changes from topic "am-2d17369d-a241-482f-bad0-edb5147de00...
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