diff options
| author | 2020-09-21 14:12:16 +0000 | |
|---|---|---|
| committer | 2020-09-21 14:12:16 +0000 | |
| commit | 1a6fa2ea729c78b8bffde7e7ee6f9c523f4003dc (patch) | |
| tree | 78bf3d64d188e4f1c1ece5362a76731d537a6ddb | |
| parent | 4a6b0e0e7a6a809b88cf6a00350c25bfa350f9db (diff) | |
| parent | 544040036e1a20c655577a6305307586e549d901 (diff) | |
Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 am: 794938dfa7 am: 544040036e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968
Change-Id: I51b0cd00440ee14c6ec07cb5ab209cf5728ae441
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 8e6022190f29..57d1a6448cc0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -17,6 +17,7 @@ package android { field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS"; field public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS"; field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK"; + field public static final String OVERRIDE_DISPLAY_MODE_REQUESTS = "android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS"; field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS"; field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS"; field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 1d853d512d75..f2a5727f74c5 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3909,6 +3909,13 @@ <permission android:name="android.permission.CONTROL_DISPLAY_BRIGHTNESS" android:protectionLevel="signature" /> + <!-- @TestApi Allows an application to override the display mode requests + so the app requested mode will be selected and user settings and display + policies will be ignored. + @hide --> + <permission android:name="android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS" + android:protectionLevel="signature" /> + <!-- @SystemApi Allows an application to control VPN. <p>Not for use by third-party applications.</p> @hide --> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 190015cebe30..f5f58efb72e6 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -323,6 +323,9 @@ <!-- Permissions required for CTS test - AdbManagerTest --> <uses-permission android:name="android.permission.MANAGE_DEBUGGING" /> + <!-- Permission needed for CTS test - DisplayTest --> + <uses-permission android:name="android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |