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
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
Treehugger Robot
1bd897f545
Merge "Remove permissions team from PermissionEnforcer OWNERS"
2022-11-07 15:14:46 +00:00
Adam Bookatz
84295be403
UM.isUserTypeEnabled @TestApi
...
Make this API available for CTS tests. This way, for device-side tests,
you can tell tests to be skipped if their purpose involves creating a
profile for which the device isn't eligible anyway.
Test: N/A
Bug: 255793314
Bug: 255377177
Bug: 241298595
Bug: 257125968
Change-Id: I3a6d93f8092e327c9d6073e68e57d1eab2cfa127
2022-11-04 14:54:23 -07:00
Treehugger Robot
4e57753b2c
Merge "Unify binder txn trace name" am: 47050bb8b6 am: ab6871e798 am: fad52f77c2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282660
Change-Id: I07cd4ac1bb3521d3a49d39e9f73e112459516506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-04 17:12:54 +00:00
Treehugger Robot
fad52f77c2
Merge "Unify binder txn trace name" am: 47050bb8b6 am: ab6871e798
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282660
Change-Id: Icf1d0a35c8d9fa7d7b7427c02969bd0d472ccb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-04 17:08:41 +00:00
Treehugger Robot
ab6871e798
Merge "Unify binder txn trace name" am: 47050bb8b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2282660
Change-Id: Id1a923219c3f5b62ba27af8a4641a9857e6755ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-04 16:38:38 +00:00
Treehugger Robot
47050bb8b6
Merge "Unify binder txn trace name"
2022-11-04 15:31:23 +00:00
Peter Kalauskas
b3cedbba88
Log wtf for warn-on-blocking on eng builds
...
Log.wtf on eng builds when setWarnOnBlocking is enabled. Previously,
setWarnOnBlocking would only log a WTF on userdebug builds.
Bug: 32715088
Test: Manual
Change-Id: Iab416c58827db558d21e518c09af1dac1569ebe8
2022-11-03 14:00:25 -07:00
Thiébaud Weksteen
3c78032454
Merge changes I72f810a7,I2bd23f62 am: 4f2bc9a73a am: 1799c950be am: 50fbaf8506
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2271808
Change-Id: Ia5532f098a54ecddb3483719d5f0089bb4cb85af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 00:22:23 +00:00
Thiébaud Weksteen
50fbaf8506
Merge changes I72f810a7,I2bd23f62 am: 4f2bc9a73a am: 1799c950be
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2271808
Change-Id: I59183dde35bc10f666d0be71ec60aa5f3e6d82ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 00:05:53 +00:00
Thiébaud Weksteen
c0c3bb836c
Add PermissionEnforcer class am: ec0d763059 am: 0c93fbab73
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2272966
Change-Id: I1d14cb0d037e5aee44447b057867e09ce781c0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 00:05:22 +00:00
Hai Zhang
2ba6452ffc
Remove permissions team from PermissionEnforcer OWNERS
...
Our team didn't implement and isn't intended to be the owner of this.
Change-Id: I7dd17d41c930fd3d1e5771e7779cb2e9927c9c43
Test: presubmit
2022-11-02 23:37:43 +00:00
Thiébaud Weksteen
1799c950be
Merge changes I72f810a7,I2bd23f62 am: 4f2bc9a73a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2271808
Change-Id: Id668deb3f8ec6b08f6e0bc9556e54cf317d41cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-02 23:37:19 +00:00
Thiébaud Weksteen
0c93fbab73
Add PermissionEnforcer class am: ec0d763059
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2272966
Change-Id: If59d54d09ee650643d28b26ef41c245acea74f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-02 23:36:55 +00:00
Thiébaud Weksteen
4f2bc9a73a
Merge changes I72f810a7,I2bd23f62
...
* changes:
Add OWNER entry for android.os.PermissionEnforcer
Add PermissionEnforcer class
2022-11-02 23:03:07 +00:00
TreeHugger Robot
cfbc9e029a
Merge "Changing hsum property in OTA won't alter mode"
2022-11-02 21:01:25 +00:00
Zim
762a8b305a
Unify binder txn trace name
...
To match cpp aidl trace name for easier perfetto parsing
Test: Manual
Bug: 161393989
Change-Id: I21d788c8de27327bd3f64da2e8cf14e6fcf9d073
2022-11-02 10:33:45 +00:00
Gil Cukierman
d67d27a123
Add DISALLOW_CELLULAR_2G As a New User Restriction am: a247dae4d4 am: c8188d9619 am: 17ca43b84e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2218172
Change-Id: I6fe8995787fdc06857763496c39d97cea5baf1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:38:21 +00:00
Gil Cukierman
17ca43b84e
Add DISALLOW_CELLULAR_2G As a New User Restriction am: a247dae4d4 am: c8188d9619
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2218172
Change-Id: I90b52049f62ac2861fe1c62a5f3693cdf19b34a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 15:02:30 +00:00
Gil Cukierman
c8188d9619
Add DISALLOW_CELLULAR_2G As a New User Restriction am: a247dae4d4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2218172
Change-Id: I130b049513d0bbd099549ff38867fa85be6514f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 14:21:53 +00:00
Gil Cukierman
6c70a328e5
Merge changes from topic "cukie-2genterprise-user-restriction"
...
* changes:
Add TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER_RESTRICTION
Add DISALLOW_CELLULAR_2G As a New User Restriction
2022-11-01 13:51:58 +00:00
Automerger Merge Worker
d1b90dae5a
Merge "Merge "Parcel: noop upon double recycle" am: 0c35c51d71 am: 79ff332cac" into tm-qpr-dev-plus-aosp am: 330457eb02
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2263989
Change-Id: Icadeaaa0d6d4cec58109a84e3ccd5068766ddb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 11:54:07 +00:00
Treehugger Robot
457b5d9438
Merge "Parcel: noop upon double recycle" am: 0c35c51d71 am: 79ff332cac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2263989
Change-Id: I2a77b7d907eec9be10501bf9abd409dda8422374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 11:34:03 +00:00
Treehugger Robot
79ff332cac
Merge "Parcel: noop upon double recycle" am: 0c35c51d71
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2263989
Change-Id: I479c14ab1cd063a4c95623080dac1d81c4c28644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-01 11:04:46 +00:00
Treehugger Robot
0c35c51d71
Merge "Parcel: noop upon double recycle"
2022-11-01 10:15:54 +00:00