Commit Graph

10580 Commits

Author SHA1 Message Date
Samiul Islam
cf5b12a679 Merge "Disallow external storage access without restricting other api calls" into tm-dev am: 5f0c868b6a am: 9d115b0558
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940795

Change-Id: Ia74a004fd18509a78f9980dcaa3d54903dbfadcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 13:38:00 +00:00
Samiul Islam
5f0c868b6a Merge "Disallow external storage access without restricting other api calls" into tm-dev 2022-05-05 13:39:34 +00:00
Automerger Merge Worker
69e7fa15db Merge "Merge "Ensure getUserName cannot return null" into tm-dev am: 1503b56202 am: 10b45a2107 am: 7a5725bfe6" into tm-qpr-dev-plus-aosp am: 8971d3596d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126297

Change-Id: I4fb5428a1b24934d4a75d0e655e1c40c287d6804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:08:20 +00:00
Adam Bookatz
293a57e986 Merge "Ensure getUserName cannot return null" into tm-dev am: 1503b56202 am: 10b45a2107 am: 7a5725bfe6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126297

Change-Id: I016b08f30e9c422128e1d1152966d350e547ee01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:30:00 +00:00
Adam Bookatz
7a5725bfe6 Merge "Ensure getUserName cannot return null" into tm-dev am: 1503b56202 am: 10b45a2107
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18126297

Change-Id: Ib4bc41d74d8f486e79e43e7b332c93a2051c562b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 17:58:46 +00:00
Adam Bookatz
1503b56202 Merge "Ensure getUserName cannot return null" into tm-dev 2022-05-04 17:20:45 +00:00
Robert Horvath
a1259789ce Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 am: 7d58f8562f am: 4d3c2b3b3e am: c87a9d244f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888925

Change-Id: Ie26692e809df2f8f8570b96603de5af60f9cab40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 14:31:15 +00:00
Robert Horvath
c87a9d244f Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 am: 7d58f8562f am: 4d3c2b3b3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888925

Change-Id: Ia7e7faef3dbd9f8ad3891e51a8422b6cfd4fd204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:52:21 +00:00
Robert Horvath
4d3c2b3b3e Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 am: 7d58f8562f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888925

Change-Id: I27355b6f1a0a429edd2a0a90d23022a849e1ff48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:29:10 +00:00
Adam Bookatz
cd2466ee30 Ensure getUserName cannot return null
A user can be created with an explicitly null name, as happens in tests.
But getUserName claims to never return null. So we must do a null-check
here to prevent it.

Bug: 227624966
Test: atest UserManagerTest
Change-Id: Iea0e7b6292c6dd49df1bebc5467091a82ddaedb5
2022-05-02 20:18:54 +00:00
Robert Horvath
d112201586 Batch log access requests from same client
For multiple log access requests from the same client
(same UID + package name) within a short timeframe, show only one
confirmation prompt to the user.

When access has been approved/denied, further requests will
automatically be approved/denied until another timeout expires, after
which a new request will show a prompt again.

If the prompt is shown but the request isn't approved or denied within a
certain time, the client will automatically be denied access.

Moved the approve/decline methods out of ILogcatManagerService into a
local service, so that they can only be called from within the system
server.

Bug: 229976778
Test: atest FrameworksServicesTests:LogcatManagerServiceTest
Change-Id: I6a3f56bdcbb84e64b1b24e73476bd24f32b75f24
2022-05-02 15:19:43 +02:00
Samiul Islam
db9e238ec7 Disallow external storage access without restricting other api calls
Currently, sandbox cannot call any apis from StorageManager that checks
calling package has same uid as calling uid. This CL fixes that by using
pm.isSameApp() api.

Additionally, since Environment.java fetches the initial application
context, the uid for that does not fall under the sandbox uid range. It
falls under app uid range. We fix the problem by checking for
PROPERTY_NO_APP_DATA_STORAGE flag on the application.

Bug: 228424287
Test: atest CtsSdkSandboxInprocessTests (see ag/17657742)
Change-Id: I8d9fca369cfbed47b40a42a44a40ff73acb712ec
2022-04-28 15:39:26 +01:00
Ian Elliott
7d633dd355 Can switch to legacy GLES driver when ANGLE is system driver
Change the sense of the run-time switches so that ANGLE can be an
optional GLES driver or the default system GLES driver.  When ANGLE is
the system GLES driver, also handle the case of there being no legacy
GLES driver.

Test: logcat
Test: atest CtsAngleIntegrationHostTestCases
Test: atest CtsEffectTestCases:android.effect.cts.EffectTest#test5_effectCreate
Bug: 224558229
Change-Id: Ie53f5221d51b62db226c0c634537959612a06655
2022-04-27 16:01:51 -06:00
Simon Bowden
c740c467e3 Revert "Change Android platform for when ANGLE is default"
Revert submission 17653617-DisableANGLE1

Reason for revert: b/230126358: candidate for test breakage on cf_x86_64_phone-userdebug
Reverted Changes:
I2446b18e9:Change Android platform for when ANGLE is default
I83e59002b:Change Android platform for when ANGLE is default

Change-Id: I068de84c6ae38c4f45a2d5a0ceac9bcaeb160ad7
2022-04-27 12:55:47 +00:00
TreeHugger Robot
4980b9c366 Merge "Revert "Restore ANGLE being enabled for game dashboard"" 2022-04-27 12:52:12 +00:00
Ian Elliott
8d8137ed42 Revert "Restore ANGLE being enabled for game dashboard"
This reverts commit 3a947939dc.

Reason for revert: Allow for revert of "Change Android platform for when ANGLE is default".  See: b/230126358: candidate for test breakage on cf_x86_64_phone-userdebug
Reverted Changes:
I2446b18e9:Change Android platform for when ANGLE is default
I83e59002b:Change Android platform for when ANGLE is default

Change-Id: Ib835ee46829a8e9106b183ca32816ca62e306b1c
2022-04-26 03:02:46 +00:00
TreeHugger Robot
67be48f640 Merge "Restore ANGLE being enabled for game dashboard" 2022-04-25 20:44:32 +00:00
Ian Elliott
3a947939dc Restore ANGLE being enabled for game dashboard
The new per-application logic resolves "default" to either ANGLE or
legacy, which prevented the game dashboard logic from being
considered.  This fixes that.

Test: CtsAngleDeveloperOptionHostTest
Bug: 224558229
Change-Id: I645ab98eb44f33f2f5c4261cb83930d9f8a7ef1d
2022-04-25 10:34:58 -06:00
Trevor Black
800b47fbb7 Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fadcd am: b976b9b638 am: b3be8d98c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135

Change-Id: I5c9aaf967b73b61fe4aba9e242188229f6fa6078
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 06:11:00 +00:00
Trevor Black
b3be8d98c1 Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fadcd am: b976b9b638
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135

Change-Id: I76ebd660f75fef00e6eab2b684d92216d2926fc6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:41:49 +00:00
Trevor Black
c794a11edc Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fadcd am: b976b9b638
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135

Change-Id: Icfedb73b68a1cc95f3071d476d532c53a61fa583
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:41:47 +00:00
Trevor Black
eba137fd33 Merge "Add Vulkan 1.2 and 1.3 to getVulkanVersion()" into tm-dev am: 3f598fadcd am: d165a566ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891135

Change-Id: I006ff53a69b97620ed3ec19f25e082406e2229ae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 05:41:19 +00:00
Felipe Leme
c464e5e9d8 Merge "Fixes SELinux property for HSUM emulation:" 2022-04-23 16:33:27 +00:00
TreeHugger Robot
154c391ef6 Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" into tm-dev-plus-aosp am: c3a19b4dda am: 823481d2f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17915199

Change-Id: I3bd44f20a4cd1fb9b241a419da02bbfaef00dc22
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 23:29:55 +00:00
Felipe Leme
4cde8e4293 Merge "Creates a mechanism to override UserManager.isHeadlessSystemUserMode()." 2022-04-22 22:17:59 +00:00
Colin Cross
f0f3bcd501 Add UpsideDownCake to aapt2 codenames and android.os.Build
Bug: 219519679
Test: m checkbuild
Change-Id: I2b668d1cd875657b27a1d52bda21f238d7020862
(cherry picked from commit d27566da4c)
Merged-In: I2b668d1cd875657b27a1d52bda21f238d7020862
2022-04-22 18:57:08 +00:00
TreeHugger Robot
af8da54c79 Merge "Change Android platform for when ANGLE is default" 2022-04-22 17:58:32 +00:00
Felipe Leme
ec00eb9336 Fixes SELinux property for HSUM emulation:
- Renames the property
- Removes temporary try/catch

Test: adb shell cmd user set-system-user-mode-emulation full # on HSUM device
Fixes: 226643927

Change-Id: Iaba42fd56dce0d8d794ef129634df78f9599260f
2022-04-21 18:52:00 -07:00
Felipe Leme
3b9744ea78 Creates a mechanism to override UserManager.isHeadlessSystemUserMode().
By default, that mode is set by the OEM and is immutable, but
this change allows developers to change it on non-user builds by
calling `cmd user set-system-user-mode-emulation`.

Notice that changing the headless system user mode is not trivial;
besides the API implementation itself, it's also necessary to:

1. Check if it's possible (for example, user 0 cannot be locked)
2. Change the system user type in the persistent XML
3. Create a full user (when going full -> headless)
4. Re-install apps for system user (when going headless -> full)

(NOTE: steps 1 and 4 will be done in a follow-up CL -
commit 3a029b05d39018ba26f8b218bab968898362138e)

Bug: 226643927

Test: adb shell cmd user set-system-user-mode-emulation full # on automotive
Test: adb shell cmd user set-system-user-mode-emulation headless # on phone
Test: adb shell dumpsys user | grep -A 1 headless

Change-Id: I5ee7d41b5baf5c8a826a1c0b9e599955eb9ad23c
2022-04-21 18:52:00 -07:00
Ian Elliott
79d076f313 Change Android platform for when ANGLE is default
Allow adb commands to select ANGLE vs the legacy GLES driver
regardless of which driver is the system (default) driver, and to
select between different versions of ANGLE if multiple versions are
installed (e.g. the built-in system driver vs. an updated APK).

Test: logcat
Bug: 224558229
Change-Id: I2446b18e96de5e5ed0b5e2ef4d1f933e2315bfe7
2022-04-21 17:10:48 -06:00
Trevor David Black
bf22232e3c Add Vulkan 1.2 and 1.3 to getVulkanVersion()
Bug: 191881132
Test: build
Change-Id: I73d18850180f2d7a627fb3879e4653d0e470d6fb
2022-04-21 18:03:07 +00:00
Colin Cross
d27566da4c Add UpsideDownCake to aapt2 codenames and android.os.Build
Bug: 219519679
Test: m checkbuild
Change-Id: I2b668d1cd875657b27a1d52bda21f238d7020862
2022-04-14 14:15:12 -07:00
Kedar Chitnis
c60e7c4119 Guest mode updates to resolve privacy concerns in guest mode
- Add API in IUserManager to allow setting ephemeral user flag
- Implement and export this API in UserManagerService and UserManager
- Set guest as ephermal by default when createGuest in UserManager is called
- Handle guest user switching in UserSwitcherController for the case
  of dynamic change of ephemeral state
- Add persistant notification when in guest mode to indicate
  - if guest session is new or previously used.
  - if guest session will be cleared on exit or not
- Add buttons in persistant notification to reset or exit guest
- Add flags to enable/disable this feature

Bug: 214031645
Screenshots: go/ephemeral-guest-b-214031645-ux
Test: Manual test using sunfish, atest SystemUITests, atest SettingsRoboTests

Relands ag/16545010 after resolving post submit issues

Revert "Revert "Guest mode updates to resolve privacy concerns in guest mode""
This reverts commit dd5c440802.

Change-Id: I46b8ab527bab8fe665114ed0fffbb06a59d49a77
Merged-In: I46b8ab527bab8fe665114ed0fffbb06a59d49a77
2022-04-14 09:47:35 +00:00
Yurii Zubrytskyi
e2de0a69ba frameworks/base - Tiramisu is now 33 #2 am: f453228161 am: 013d7fda60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699092

Change-Id: I237cac1b3b693b1c127dc11cdb385933f5265af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 06:48:54 +00:00
Yurii Zubrytskyi
f453228161 frameworks/base - Tiramisu is now 33 #2
Set current API level

Test: Build and boot
Bug: 225745567
Change-Id: If135d9795e812cc286c720b9351eaf6be621fd5b
2022-04-12 12:35:04 -07:00
Lee Shombert
ae7c5b2d67 Merge "Helper classes for IpcDataCache clients" into tm-dev am: ead48cc667 am: 721df1d1c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542360

Change-Id: I8a723c34fb5a9658ff3c2949e710a9d499699e58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:35:46 +00:00
Lee Shombert
ead48cc667 Merge "Helper classes for IpcDataCache clients" into tm-dev 2022-04-12 14:32:31 +00:00
Lee Shombert
529a49ee3d Helper classes for IpcDataCache clients
Bug: 227653108

This adds a helper class that can reduce much of the boilerplate in
code that uses IpcDataCache (or the internal-only variant,
PropertyInvalidatedCache).  See the changes to DevicePolicyManager for
example usage.

Two PropertyInvalidatedCaches APIs are exposed for testing.  The
method createPropertyName() is changed so that apis like "Foo" are
converted to "foo", not "_foo".

Unit tests for the new behavior are added to IpcDataCacheTest.

This was manually tested by dumping the cache info from builds with
and without this change.  Special attention is paid to the
DevicePolicyManager caches.  The same caches were found (as identified
by their key and api) and the caches were enabled/disabled the same.

In the course of testing, multiple instances of DevicePolicyManager
caches were observed.  Cache performance is better if the caches are
static; making them static will be addressed in b/228452829.

Test:
 * atest FrameworksCoreTests:IpcDataCacheTest
 * atest FrameworksCoreTests:PropertyInvalidatedCacheTests
 * atest FrameworksServicesTests:DevicePolicyConstantsTest
 * atest FrameworksServicesTests:DevicePolicyEventLoggerTest
 * atest FrameworksServicesTests:DevicePolicyManagerServiceMigrationTest
 * atest FrameworksServicesTests:DevicePolicyManagerTest
 * atest FrameworksServicesTests:EnterpriseSpecificIdCalculatorTest
 * atest FrameworksServicesTests:OverlayPackagesProviderTest
 * atest FrameworksServicesTests:OwnersTest
 * atest FrameworksServicesTests:PolicyVersionUpgraderTest
 * atest FrameworksServicesTests:SecurityEventTest
 * atest FrameworksServicesTests:SystemUpdatePolicyTest
 * atest FrameworksServicesTests:TransferOwnershipMetadataManagerTest
 * atest MixedDeviceOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile
 * atest MixedDeviceOwnerTest#testSetKeyguardDisabledFeatures
 * atest MixedManagedProfileOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile
 * atest MixedManagedProfileOwnerTest#testNetworkLoggingDelegate
 * atest MixedManagedProfileOwnerTest#testSetKeyguardDisabledFeatures
 * atest OrgOwnedProfileOwnerTest#testIsDeviceOrganizationOwnedWithManagedProfile
 * atest OrgOwnedProfileOwnerTest#testNetworkLoggingDelegate
 * atest OrgOwnedProfileOwnerTest#testSetKeyguardDisabledFeatures
 * atest android.devicepolicy.cts.DevicePolicyManagerTest
 * atest android.devicepolicy.cts.NetworkLoggingTest
 * atest com.android.cts.devicepolicy.DeviceOwnerTest#testAdminActionBookkeeping

Change-Id: I2f4fe4ed25db5fb3100334b9d2ce748ee928c10d
2022-04-11 07:27:16 -07:00
Michael Wright
52f1d5eca6 Merge "DO NOT MERGE Remove PWLE APIs from T" into tm-dev 2022-04-08 10:57:11 +00:00
Eric Biggers
53c5aead70 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8 am: 4d4ababae0 am: 256a0b563f am: 81a31082a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I1d699ad1e3be192c95f974bab2a582656b67d8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:21:46 +00:00
Eric Biggers
256a0b563f Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8 am: 4d4ababae0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: I6c0ee77edf164ecf5a285afe4dff7cec85e9d668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 02:11:26 +00:00
Eric Biggers
4d4ababae0 Merge changes Idc218e5f,I26c3fafc am: 7e3c5382cc am: fb4c1822a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052056

Change-Id: Ib029dddb2fd26fa33f231b7ae87c3a1fee737a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 01:36:12 +00:00
Michael Wright
38dc7aa55c DO NOT MERGE Remove PWLE APIs from T
Fixes: 228529016
Test: build
Change-Id: Icfd576f3dff0850f464be32c5a3315e723c3d380
2022-04-07 23:26:18 +00:00
Eric Biggers
bd13f84152 Remove more FDE methods from StorageManager
Now that these methods are no longer called, and none of them are a
public API or have @UnsupportedAppUsage, they can be removed.

inCryptKeeperBounce() actually had one known app user via reflection,
despite the method not having @UnsupportedAppUsage.  However, that user
only made the call if Build.VERSION.SDK_INT < VERSION_CODES.P, so it is
not being used anymore.

Bug: 208476087
Change-Id: Idc218e5f355bb61257b07cf5b5b6df5f4c6ece11
2022-04-07 16:38:36 +00:00
TreeHugger Robot
b6ac4a054b Merge "Parcel: recycle recycles" into sc-v2-dev am: c4ca84a2b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17525716

Change-Id: I74935ed1dab8dc6923f58ec237e0884e85380829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 17:15:24 +00:00
Kedar Chitnis
4139a0b099 Merge "Guest mode updates to resolve privacy concerns in guest mode" 2022-04-06 04:18:05 +00:00
Stephanie Bak
ceebf4ad17 Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev am: 73b3dc4fb4 am: cae672b243
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17563878

Change-Id: I3c62e923b7500fed2c63c3d0ed5b8e397d2a4e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 11:34:03 +00:00
Stephanie Bak
73b3dc4fb4 Merge "Expand Javadoc for DISALLOW_WIFI_TETHERING" into tm-dev 2022-04-05 10:13:39 +00:00
Stephanie Bak
52cf82d495 Expand Javadoc for DISALLOW_WIFI_TETHERING
Bug: 226126768
Test: atest UserManagerTest
Change-Id: I1a1e166b4238ff20f30dfd7a2664d9a33dbe020c
2022-04-04 18:51:21 +00:00
Ling Ma
67bcc18224 Merge "setProperty check for byte limit" am: 18b4802337 am: 4cd991467f am: 39709e6beb am: 5b37044c20 am: 94d2679f0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004952

Change-Id: I17d7a5feaf60ef8910c6f12defd70cf2821405ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 23:28:04 +00:00