diff options
| -rw-r--r-- | core/api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index ffce929e4cb5..66943031aeb5 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -28,6 +28,8 @@ package android { field public static final String ACCESS_ULTRASOUND = "android.permission.ACCESS_ULTRASOUND"; field public static final String ACCESS_VIBRATOR_STATE = "android.permission.ACCESS_VIBRATOR_STATE"; field public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING"; + field public static final String ADD_ALWAYS_UNLOCKED_DISPLAY = "android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY"; + field public static final String ADD_TRUSTED_DISPLAY = "android.permission.ADD_TRUSTED_DISPLAY"; field public static final String ADJUST_RUNTIME_PERMISSIONS_POLICY = "android.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY"; field public static final String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE"; field public static final String ALLOW_ANY_CODEC_FOR_PLAYBACK = "android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"; @@ -2428,7 +2430,7 @@ package android.companion.virtual { public static final class VirtualDeviceParams.Builder { ctor public VirtualDeviceParams.Builder(); method @NonNull public android.companion.virtual.VirtualDeviceParams build(); - method @NonNull @RequiresPermission(value="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY", conditional=true) public android.companion.virtual.VirtualDeviceParams.Builder setLockState(int); + method @NonNull @RequiresPermission(value=android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY, conditional=true) public android.companion.virtual.VirtualDeviceParams.Builder setLockState(int); method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setUsersWithMatchingAccounts(@NonNull java.util.Set<android.os.UserHandle>); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index bc6ac01ccfb7..b250a95489d8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -6090,13 +6090,13 @@ <permission android:name="android.permission.ACCESS_TV_SHARED_FILTER" android:protectionLevel="signature|privileged|vendorPrivileged" /> - <!-- Allows an application to create trusted displays. @hide --> + <!-- Allows an application to create trusted displays. @hide @SystemApi --> <permission android:name="android.permission.ADD_TRUSTED_DISPLAY" - android:protectionLevel="signature" /> + android:protectionLevel="signature|role" /> - <!-- Allows an application to create always-unlocked displays. @hide --> + <!-- Allows an application to create always-unlocked displays. @hide @SystemApi --> <permission android:name="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY" - android:protectionLevel="signature"/> + android:protectionLevel="signature|role"/> <!-- @hide @SystemApi Allows an application to access locusId events in the usage stats. --> <permission android:name="android.permission.ACCESS_LOCUS_ID_USAGE_STATS" diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 4dddc8c7777c..2b7e8ab6813e 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -204,7 +204,6 @@ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" /> <uses-permission android:name="android.permission.CREATE_USERS" /> <uses-permission android:name="android.permission.QUERY_USERS" /> - <uses-permission android:name="android.permission.CREATE_VIRTUAL_DEVICE" /> <uses-permission android:name="android.permission.MANAGE_CREDENTIAL_MANAGEMENT_APP" /> <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" /> @@ -630,6 +629,11 @@ <uses-permission android:name="android.permission.READ_SAFETY_CENTER_STATUS" /> <uses-permission android:name="android.permission.MANAGE_SAFETY_CENTER" /> + <!-- Permissions required for CTS test - CtsVirtualDevicesTestCases --> + <uses-permission android:name="android.permission.CREATE_VIRTUAL_DEVICE" /> + <uses-permission android:name="android.permission.ADD_TRUSTED_DISPLAY" /> + <uses-permission android:name="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY" /> + <!-- Permission required for CTS test - Notification test suite --> <uses-permission android:name="android.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL" /> |