Commit Graph

11055 Commits

Author SHA1 Message Date
Matt Gilbride
b991fd2c9e Merge "Make getCallingUidOrThrow() not throw in clearCallingIdentity() blocks" am: a3862537ff am: 2f3bc71868 am: 96cf82ee53
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2311186

Change-Id: Ida72d323ed6e7692b58d07cecab31267b31dc063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 17:07:05 +00:00
Matt Gilbride
96cf82ee53 Merge "Make getCallingUidOrThrow() not throw in clearCallingIdentity() blocks" am: a3862537ff am: 2f3bc71868
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2311186

Change-Id: Idf161d70dfa5fe1a029245b5a568e9e0dde3baa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 12:05:35 +00:00
Matt Gilbride
2f3bc71868 Merge "Make getCallingUidOrThrow() not throw in clearCallingIdentity() blocks" am: a3862537ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2311186

Change-Id: I4ad458fee77e00dd491407a5122c3c1173cf4e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 11:40:26 +00:00
TreeHugger Robot
5a7f703be3 Merge changes from topic "art-module-service-manager"
* changes:
  Revert "Expose ServiceManager.waitForService as system API."
  Register ArtModuleServiceManager on system server initialization.
2022-11-21 20:31:46 +00:00
mattgilbride
d8323e8684 Make getCallingUidOrThrow() not throw in clearCallingIdentity() blocks
The new method hasExplicitIdentity will track whether the caller is
within a Binder.clearCallingIdentity/restoreCallingIdentity block based
on packing this state information into the token returned by clearCallingIdentity.

Bug: b/252975769
Test: android.os.cts.BinderTest
Change-Id: I162db933f9e52cd6f9f46796bda11ad6216d3d66
2022-11-21 20:24:28 +00:00
Himanshu Gupta
44fa1ce60b Merge "Downgrading API permissions for updateExternalStorage" 2022-11-21 19:15:30 +00:00
Lucas Silva
d41cf351bc Merge "Update dream battery drain monitoring to exclude when charging is being artificially limited." into tm-qpr-dev am: e223e2bd01 am: d6ee230417
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20476147

Change-Id: I56fe47a13ccfc900a543c2cf35f700e4e10e0be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-19 21:11:22 +00:00
Lucas Silva
d6ee230417 Merge "Update dream battery drain monitoring to exclude when charging is being artificially limited." into tm-qpr-dev am: e223e2bd01
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20476147

Change-Id: Ie1f2f2936122639d00f8af7529c95a770590a9dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-19 20:39:02 +00:00
Jiakai Zhang
c39c0be88f Revert "Expose ServiceManager.waitForService as system API."
This reverts commit ee13e8d435.

Reason for revert: As discussed in b/233915142, an API that can obtain an arbitrary binder should not be exposed, and mainline modules should generally follow go/android-api-guidelines#the-moduleservicemanager-pattern.

Bug: 233915142
Test: Presubmit
Change-Id: I67e6e177d48ed213306aa0c10f83fe3b670daf1d
2022-11-18 18:12:48 +00:00
Jiakai Zhang
5dba0d5a49 Merge "Add ArtModuleServiceManager." 2022-11-18 15:12:23 +00:00
Himanshu Gupta
c04c7a230f Downgrading API permissions for updateExternalStorage
With ag/19901205 the permissions for this API were increased,
and calling users required 'MANAGE_EXTERNAL_STORAGE' permissions.

There is now a way to add the same functionality without
adding any additional permissions.

Bug: 235321217
Test: atest android.appsecurity.cts.StorageHostTest
Change-Id: I6b166ac191a80c600b527266f53107b8d9c78177
2022-11-18 14:54:12 +00:00
Nikita Ioffe
4c098eae7d Merge "Add Process.isIsolatedUid(int uid) API" am: 4fa14ea225 am: 8a2d970870 am: 28383f455e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2231970

Change-Id: I2486ffd0f0902ce11b46ec7dd41eed48fe95332a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 19:40:11 +00:00
Jiakai Zhang
b8ee0118cc Add ArtModuleServiceManager.
This is to replace ServiceManager, which the ART module is currently
using to get the "artd" service.

Only the ART mainline module will be able to access an instance of this
class.

Bug: 233915142
Test: Presubmit
Change-Id: I94953bc7fbf471e142b1ab375fe1624bebd2a4ea
2022-11-16 18:52:19 +00:00
Nikita Ioffe
28383f455e Merge "Add Process.isIsolatedUid(int uid) API" am: 4fa14ea225 am: 8a2d970870
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2231970

Change-Id: I96d6b506b4a88228475f265a68a7ce67f869b2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 17:31:08 +00:00
Nikita Ioffe
8a2d970870 Merge "Add Process.isIsolatedUid(int uid) API" am: 4fa14ea225
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2231970

Change-Id: Id44255ed0e6e396367f67e82b8c9834d8f4d4ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16 17:00:29 +00:00
Nikita Ioffe
4fa14ea225 Merge "Add Process.isIsolatedUid(int uid) API" 2022-11-16 16:58:19 +00:00
Oli Lan
327a277684 Merge "Add isMainUser system API." 2022-11-15 18:05:57 +00:00
Parth Sane
6685481d09 Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" am: 60bcab9367 am: 2ca4a6f36a am: 5b4c044637
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2297837

Change-Id: I7134ba1c199e0c74d3a70dcefae321413277f5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 14:04:30 +00:00
Parth Sane
5b4c044637 Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" am: 60bcab9367 am: 2ca4a6f36a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2297837

Change-Id: I0876dc9bbf39aca17d0ba7caa0f26d3ed4176c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 13:43:14 +00:00
Parth Sane
2ca4a6f36a Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" am: 60bcab9367
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2297837

Change-Id: Ic57f33eaadd7a7a197cfabb44a7d362a77c71694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-15 13:27:51 +00:00
Parth Sane
60bcab9367 Merge "Add TRACE_TAG_AIDL to SystemApi for mainline modules" 2022-11-15 13:03:21 +00:00
Oli Lan
f8a6722afc Add isMainUser system API.
This adds an API to determine if the context user is the designated
main user on the device. This user may have access to features which
are limited to a single user on the device.

In Android U, this will be the first user to go through setup.

On regular devices, this will be the system user, but on devices in
No Primary User / Headless System User Mode, it will be a different
user.

The isPrimaryUser System API is confusing because it actually always
returns the system user, even in headless mode. That API is deprecated
in this change.

On devices that are upgrading, if they are non-headless, the system user
will be the main user. If they are headless, the full user with the
earliest creation date will be given the flag.

Bug: 256624031
Test: atest UserManagerTest
Change-Id: Ib36f3b372f9bf33cbb097c4af63eb43515ac835b
2022-11-15 10:47:38 +00:00
Lucas Silva
a233bba91e Update dream battery drain monitoring to exclude when charging is being
artificially limited.

We may limit charging when battery is overheating, or due to dock defend
or other battery defend mechanisms. In these cases, the battery is
expected to drain while dreaming since charging is limited. Therefore,
do not exit dreams in this case.

Test: atest PowerManagerServiceTest
Fixes: 258027228
Change-Id: I10ce0c848892b42267d819d07a284d17a97899d1
2022-11-14 22:53:07 -05:00
Automerger Merge Worker
0077f82b7b Merge "Merge "ServiceManager APIs for Remote Key Provisioning mainline module." am: 81c4fd8041 am: 0dda81576c" into tm-qpr-dev-plus-aosp am: 3966b14282
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299820

Change-Id: Icf1bde247713c6b71f3f235d4598b6693ed416ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 22:25:29 +00:00
TreeHugger Robot
a9a29f94dd Merge "UM.isUserTypeEnabled @TestApi" 2022-11-14 22:23:46 +00:00
Vikram Gaur
c6bab3f0d4 Merge "ServiceManager APIs for Remote Key Provisioning mainline module." am: 81c4fd8041 am: 0dda81576c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299820

Change-Id: Ie26bded6be2ea88e2f6b58108a18093434dc9663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 21:38:10 +00:00
Vikram Gaur
0dda81576c Merge "ServiceManager APIs for Remote Key Provisioning mainline module." am: 81c4fd8041
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299820

Change-Id: Ifd1b61af5be088fcb6695110e73561f67a82052c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 21:09:08 +00:00
Adam Bookatz
8d8b2c2dc7 Merge "SystemProperty to create disabled usertypes" 2022-11-14 19:28:28 +00:00
TreeHugger Robot
607f995051 Merge "Squash frequency control capability for merged multi-vibrators when missing frequency profile." into tm-qpr-dev am: 8cd94e33fa am: 9dfb0c4f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20441507

Change-Id: Ib29fc028c15fe43f6ee4f77d438527a36754541f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:39:48 +00:00
TreeHugger Robot
9dfb0c4f3a Merge "Squash frequency control capability for merged multi-vibrators when missing frequency profile." into tm-qpr-dev am: 8cd94e33fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20441507

Change-Id: I44074f4c07e7070d8ff7931b56f8f4cee9b4f611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-14 13:05:51 +00:00
Sean Stout
84b05e021d Merge "Remove unnecessary use of List in FileUtils" 2022-11-14 05:51:52 +00:00
Roshan Pius
330e227208 Merge "Implement DISALLOW_ULTRA_WIDEBAND_RADIO AE user restriction" 2022-11-12 16:04:06 +00:00
Vikram Gaur
81a458a73c ServiceManager APIs for Remote Key Provisioning mainline module.
ServiceManager.getDeclaredInstances is needed for Remote Key
Provisioning mainline module to get all the implementations for
IRemotelyProvisionedComponent.

Test: build + usage in Remote Key Provisioning mainline module.
Change-Id: I92545104fa9bc190fe7c2f84b33d5f8693fcc2a4
2022-11-11 22:46:33 +00:00
Matt Buckley
b091fb85de Merge "Add support for ADPF HintSession sendHint to JNI" 2022-11-11 17:54:42 +00:00
Adam Bookatz
82c53f0c85 SystemProperty to create disabled usertypes
For development, it helps to be able to create users whose usertype is
disabled or their limit has been reached.
We therefore introduce a system property for this.
It can only be used on debug builds.

Bug: 255793314
Bug: 137101239
Test: adb shell setprop debug.user.creation_override 1 && try to create disabled users
Change-Id: I6ab2aa80b0387b32f1b5fe5e9c8dd0096ed7bcd7
2022-11-10 14:14:47 -08:00
Peter Kalauskas
1c4b61bb12 Merge "Log wtf for warn-on-blocking on eng builds" am: 66e5f1dac2 am: 5f154f25fe am: 704774269a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2285778

Change-Id: Iadaac46cde7af10ece99fd7eb1f2123967d306c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 20:19:44 +00:00
TreeHugger Robot
16f6b9a496 Merge "Changed UserManager.getVisibleUsers() to return Set instead of List." 2022-11-10 20:11:17 +00:00
Peter Kalauskas
704774269a Merge "Log wtf for warn-on-blocking on eng builds" am: 66e5f1dac2 am: 5f154f25fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2285778

Change-Id: I58dc06253115900725321730cd57889896c42273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 20:08:58 +00:00
Simon Bowden
69eaf72cf1 Squash frequency control capability for merged multi-vibrators when
missing frequency profile.

Some CTS tests for frequency data assume that it exists (i.e. crash when
it doesn't) when a device claims it hasFrequencyControl. Note that the
API is currently non-public.

Bug: 257032261
Test: atest VibratorTest
Change-Id: Id1c1ae555f42009cb394a6cef664624054b575ac
2022-11-10 19:26:54 +00:00
Peter Kalauskas
5f154f25fe Merge "Log wtf for warn-on-blocking on eng builds" am: 66e5f1dac2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2285778

Change-Id: Ieaca8f7cd9fbb7045ea1b099a7539bca3de8d4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 19:24:57 +00:00
Peter Kalauskas
66e5f1dac2 Merge "Log wtf for warn-on-blocking on eng builds" 2022-11-10 18:47:39 +00:00
Ante
6ee8817cf7 Implement DISALLOW_ULTRA_WIDEBAND_RADIO AE user restriction
Ultra-wideband (UWB) is a radio technology that can use a very low
energy level for short-range, high-bandwidth communications over a
large portion of the radio spectrum. This CL adds a user restriction
for disallowing UWB on a device. A user restriction is needed for
NIAP (Common Criteria) certification (see b/239714441). One of the
requirements for the certification is to be able to enable/disable
all the radios.

Bug: 239714441
Test: m; manual testing with testDPC;
Change-Id: Icfa16258cc789c337417c2e96a4e0c37d0030d55
2022-11-10 17:24:56 +00:00
Parth Sane
1eb9a2e634 Add TRACE_TAG_AIDL to SystemApi for mainline modules
Test: manual

Change-Id: I76de5146f49256884e2de88dcb42789365e5d081
Bug: 236441443
2022-11-10 15:37:52 +00:00
Bill Yi
0de01a9871 Merge TP1A.221105.002 to aosp-master - DO NOT MERGE
Merged-In: I7caa2e966bae2ec146ca77b36d2a467d746e2531
Merged-In: I361e8838571ab7b3f19778833b820f0b1b584d94
Merged-In: I361e8838571ab7b3f19778833b820f0b1b584d94

Change-Id: Ic9224a1948b26c8703a272aa3b26337e0586f3e3
2022-11-09 06:33:42 +00:00
Matt Buckley
354cc0a140 Add support for ADPF HintSession sendHint to JNI
* Add sendHint API to HintManagerService and PerformanceHintManager
 * Plumb relevant calls through the existing implementation
 * Extend existing tests to cover new API calls
 * Update the relevant build files to use power API v4

Bug: b/243973548
Test: atest PerformanceHintNativeTestCases
Test: atest FrameworksCoreTests:android.os.PerformanceHintManagerTest
Test: atest HintManagerServiceTest

Change-Id: Ice7ed8f32e877bd845afad77fcc6ae16f1a1b78c
2022-11-09 01:49:41 +00:00
Alessandra Loro
045c55c4b3 Expose ro.secure test endpoint for cts.
Bug: 247053706
Test: android.os.cts.BuildTest

Change-Id: If0d0b13a53717d221a7eab8ffbd4b08f71db00c5
2022-11-08 18:19:31 +00:00
Felipe Leme
bc505674df Changed UserManager.getVisibleUsers() to return Set instead of List.
Test: atest MultipleUsersOnMultipleDisplaysTest CtsMultiUserTestCases:android.multiuser.cts.UserManagerTest
Test: m update-api

Bug: 242801948

Change-Id: Ie18531e65bff66c7e4f9af8b5134e04a8d4f1016
2022-11-07 19:38:36 +00:00
Treehugger Robot
0cea16dce2 Merge "Remove permissions team from PermissionEnforcer OWNERS" am: 1bd897f545 am: 2f81ba23b1 am: 9d7dc6120f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282076

Change-Id: I25e6a9c11fccc2557d8f6dbfac34898fafe0ec0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 16:52:51 +00:00
Treehugger Robot
9d7dc6120f Merge "Remove permissions team from PermissionEnforcer OWNERS" am: 1bd897f545 am: 2f81ba23b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282076

Change-Id: Id43f16f37389ee61b663e90289aeee3aa8f303a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 16:20:48 +00:00
Treehugger Robot
2f81ba23b1 Merge "Remove permissions team from PermissionEnforcer OWNERS" am: 1bd897f545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282076

Change-Id: Ife5037af2f34045622b8fa5ad032ab49235f2dc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 15:51:52 +00:00