Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 990e3429 authored by Maurice Lam's avatar Maurice Lam
Browse files

Make ADD_TRUSTED_DISPLAY and ADD_ALWAYS_UNLOCKED_DISPLAY "role" 

These 2 permissions are needed for app streaming, so add them to the
APP_STREAMING role. They are also added to the Shell for CTS testing.

Fixes: 205062006
Bug: 204606917
Test: ag/16633813
Change-Id: I66903ba11694e1a57aecf1a12ed1f7e0f6eab811
Ignore-AOSP-First: Permissions are for features not in AOSP yet
parent c11852d4

core/api/system-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -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";
@@ -2773,7 +2775,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>);

  }

























core/res/AndroidManifest.xml



+4
−4




























Original line number
Diff line number
Diff line








@@ -5999,13 +5999,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"

































packages/Shell/AndroidManifest.xml



+5
−1




























Original line number
Diff line number
Diff line








@@ -203,7 +203,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" />










@@ -624,6 +623,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" />