Commit Graph

641296 Commits

Author SHA1 Message Date
Selim Cinek
07107bead9 Merge "Updating owners in core and in resources" 2021-05-14 17:21:16 +00:00
Jay Patel
7542dc70b7 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 8f43581b46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I3b4a3c970a6ff377cb40d71ab3b0d9f64d2c4b1c
2021-05-14 17:20:48 +00:00
Jay Patel
ecf29aa930 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 1feaa9f621
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I78ba7a3456ff348c518c8d50a6c22f0216b08004
2021-05-14 17:20:18 +00:00
Jay Patel
964497aa28 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 307b7d3ac1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I39050b26ed6d822e86d8de882ac486f59c5dd82e
2021-05-14 17:19:51 +00:00
lucaslin
ad158b70a3 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours am: 1e169e7ef8 -s ours am: e159dbb07f -s ours
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486304

Change-Id: I6d5450a244f74e191848c36abe5ef07eb42d8699
2021-05-14 17:19:43 +00:00
lucaslin
dbd1da95f1 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours am: 0c2eb39dfb -s ours am: f793f6516e -s ours
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 c737926795 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486206

Change-Id: I54b0cdaeb4983940cd10ea53d0d4122141170100
2021-05-14 17:19:34 +00:00
Nate Myren
d113b382d1 [automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb49 am: 2f2fa37a18 -s ours am: ccf88a6577 -s ours
am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 37acd7ee52 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14357211

Change-Id: I6f1b8010d25aabdf416c7b1835163aad9c54bad1
2021-05-14 17:19:19 +00:00
Jay Patel
af91071bfb Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: f58b846016
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I0ba88bae22ee2165ecd8db9048bf194e2c171433
2021-05-14 17:19:15 +00:00
Jay Patel
87b9f9f432 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: e4409e6b7e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: Iefc3d45c6e370809d3d489b632a48553a04c0919
2021-05-14 17:18:52 +00:00
Jay Patel
645e8be668 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: e71830dafc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I0506c9e459375728796709f48c14156da425b860
2021-05-14 17:18:15 +00:00
Jay Patel
b56a9f0a05 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 3036d7bf83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: If96adf1266845dccc53d55f87f3e2da9a18ef49b
2021-05-14 17:17:36 +00:00
lucaslin
785bd0c116 [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: 0684e7a64a -s ours am: 0f311f7b28 -s ours am: 12f7871029 -s ours am: 1e169e7ef8 -s ours am: e159dbb07f -s ours
am skip reason: Merged-In I12050737291c7fa0ebff4e7411b91f4c6f57a413 with SHA-1 e97d1f5484 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486304

Change-Id: I8ff6cb9a9741260d8a9f3d642606b4889e1af07a
2021-05-14 17:15:50 +00:00
lucaslin
0447af099d [automerger skipped] Fix the security issue that preloaded apps can get SSID & BSSID am: e97d1f5484 -s ours am: e100b24420 -s ours am: 0c2eb39dfb -s ours am: f793f6516e -s ours
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 c737926795 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486206

Change-Id: I6e3782154a9aad4b1c08924b458b3849d9a29d88
2021-05-14 17:15:38 +00:00
Nate Myren
4bca56e7af [automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb49 am: 2f2fa37a18 -s ours am: ccf88a6577 -s ours am: f498567ea3 -s ours
am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 8a1085bdcb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14357211

Change-Id: I028e790d7b4a3c44a2242c3e24cf375b4ea032de
2021-05-14 17:15:30 +00:00
Nate Myren
f498567ea3 [automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb49 am: 2f2fa37a18 -s ours am: ccf88a6577 -s ours
am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 8a1085bdcb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14357211

Change-Id: I0f1ada0caf8bb5f6019d61a6d8926f02d8f4f323
2021-05-14 17:15:21 +00:00
Louis Chang
57db689823 [automerger skipped] Merge "Detects all activities for whether showing work challenge" into rvc-qpr-dev am: 8e9e41c0f1 -s ours
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 69b3a3cd04 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170750

Change-Id: I200d54467b6bf120439f16640dc9a6942ecae8d6
2021-05-14 17:15:11 +00:00
TreeHugger Robot
f012f6f780 Merge "Reset pending oomadj target list after oomadj update" into sc-dev 2021-05-14 17:13:37 +00:00
Christian Wailes
cd95e9fa3b Merge "Fix error formatting issues" 2021-05-14 17:12:04 +00:00
Tracy Zhou
ccbd8e1d02 Merge "Revert "Allow pulling down the status bar in visual immersive mode"" into sc-dev 2021-05-14 17:03:22 +00:00
Nader Jawad
40943ec440 Merge changes I0b36f486,Ida0d0dee into sc-dev
* changes:
  Improve Stretch shader performance more
  Improve Stretch shader performance
2021-05-14 17:03:18 +00:00
Tracy Zhou
e8b19dcf9d Revert "Allow pulling down the status bar in visual immersive mode"
This reverts commit 9d14dbe89d.

Reason for revert: Likely broke tests
Bug: 188176340

Change-Id: I0c786e792322f7350b3bb16018ccb39e77a276a2
2021-05-14 17:02:55 +00:00
Greg Daniel
830db628b8 Merge "Add a mutex to VulkanManager::initialize." into sc-dev 2021-05-14 16:55:14 +00:00
Jay Patel
a111377f7d Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:53 +00:00
Jay Patel
d28e890b48 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:50 +00:00
Jay Patel
8db1be84ce Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:47 +00:00
Jay Patel
8f43581b46 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:44 +00:00
Jay Patel
1feaa9f621 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:34 +00:00
Jay Patel
307b7d3ac1 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:31 +00:00
Jay Patel
f58b846016 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:27 +00:00
Jay Patel
e4409e6b7e Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:24 +00:00
Jay Patel
e71830dafc Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:18 +00:00
Jay Patel
3036d7bf83 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master 2021-05-14 16:44:09 +00:00
TreeHugger Robot
d285109ef2 Merge "Close FDs even when throwing SecurityException." into sc-dev 2021-05-14 16:40:14 +00:00
Gavin Corkery
f8b9d5cd0b Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9 am: 589f728b5a am: b81e3635e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706699

Change-Id: Ia50c7f70cf37f42399f3b447f03a4857473e739c
2021-05-14 16:36:47 +00:00
TreeHugger Robot
54b18bd8e8 Merge "Add validity check to detect invalid PDUs." into sc-dev 2021-05-14 16:32:33 +00:00
Chavi Weingarten
1b0e20108d Merge "Add CAPTURE_BLACKOUT_CONTENT permission" into sc-dev 2021-05-14 16:28:43 +00:00
Lee Shombert
457d516dc0 Cleanup the PM Computer class
Bug: 188048343

The Computer exposes a number of interfaces that are no longer needed
outside the computer itself.  The declarations are removed from the
interface.  PM trampolines are also removed.

If the method is never locked then it is made private in
ComputerEngine.  Otherwise it is made protected in ComputerEngine (so
it can be locked in ComputerEngineLocked) and it is made final in
ComputerEngineLocked.

Test: atest
 * CtsContentTestCases:IntentFilterTest
 * CtsDynamicMimeHostTestCases
 * CtsRoleTestCases
 * FrameworksServicesTests:UserSystemPackageInstallerTest
 * FrameworksServicesTests:PackageManagerSettingsTests
 * FrameworksServicesTests:PackageManagerServiceTest
 * FrameworksServicesTests:AppsFilterTest
 * FrameworksServicesTests:PackageInstallerSessionTest
 * FrameworksServicesTests:ScanTests
 * UserLifecycleTests#startUser
 * UserLifecycleTests#stopUser
 * UserLifecycleTests#switchUser
 * FrameworksServicesTests:WatcherTest
 * android.appsecurity.cts.EphemeralTest
 * android.appsecurity.cts.InstantAppUserTest
Change-Id: I42a70ee2d7a1e1c562db482c30260361afc5b617
2021-05-14 16:21:02 +00:00
Gavin Corkery
b81e3635e3 Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9 am: 589f728b5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706699

Change-Id: I3dfb6041919201ad6129da0d33101c768d471918
2021-05-14 16:20:11 +00:00
Steven Ng
8de89d0fb8 Merge "Update widget suspended layout" into sc-dev 2021-05-14 16:15:39 +00:00
Ahaan Ugale
6bf4cb6147 Merge "Make InputMethodInfo#showInInputMethodPicker public." into sc-dev 2021-05-14 16:14:00 +00:00
Ming-Shin Lu
c0b5d73b18 Merge "Remove updateImeParent in RecentsAnimationController" into sc-dev 2021-05-14 16:10:02 +00:00
Gavin Corkery
589f728b5a Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706699

Change-Id: I5f6ebb0e79f5fdeb98f1d247205d07c2536004e4
2021-05-14 16:05:10 +00:00
Gavin Corkery
324a5e53a9 Merge "Add per-file bugreporting OWNERS" 2021-05-14 15:40:45 +00:00
Fiona Campbell
2188e52237 Merge "Use config.xml as brightness default fallback." into sc-dev 2021-05-14 15:38:58 +00:00
Arthur Hung
9934d807f9 Merge "Add debug log for long press power" into sc-dev 2021-05-14 15:21:28 +00:00
Lucas Dupin
1ecac1ab60 Merge "[ANR] Read device icon on the main thread" into sc-dev 2021-05-14 15:08:58 +00:00
Beth Thibodeau
ff15f21812 Merge "Update resume icon and colors" into sc-dev 2021-05-14 14:56:04 +00:00
TreeHugger Robot
c19e092bc5 Merge "Fix ColorFade would be cut when turn off screen in landscape" into sc-dev 2021-05-14 14:47:00 +00:00
Jamie Garside
f24f5c508d Merge "Renamed enableOneHandedBouncer to enableDynamicKeyguardPositioning." into sc-dev 2021-05-14 14:46:53 +00:00
Greg Daniel
1d9de71ed9 Add a mutex to VulkanManager::initialize.
The initialize call can be made from both an GrallocUploadThread
and the RenderThread. So we need a mutex to make sure both
threads don't try to initialize in parallel.

Bug: 187218890
Test: manual running of device, guessing this could fix bug.
Change-Id: I203afd91fad5eacc131c839dff1a1065864b76f8
2021-05-14 10:42:34 -04:00