Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 am: 794938dfa7 am: 544040036e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420968

Change-Id: I51b0cd00440ee14c6ec07cb5ab209cf5728ae441
This commit is contained in:
Marin Shalamanov
2020-09-21 14:12:16 +00:00
committed by Automerger Merge Worker
parent 4a6b0e0e7a 544040036e
commit 1a6fa2ea72
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -17,6 +17,7 @@ package android {
field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS"; 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_SETTINGS = "android.permission.NETWORK_SETTINGS";
field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK"; 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 READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS"; field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";
field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS"; field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";

7
core/res/AndroidManifest.xml
View File

@@ -3909,6 +3909,13 @@
<permission android:name="android.permission.CONTROL_DISPLAY_BRIGHTNESS" <permission android:name="android.permission.CONTROL_DISPLAY_BRIGHTNESS"
android:protectionLevel="signature" /> 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. <!-- @SystemApi Allows an application to control VPN.
<p>Not for use by third-party applications.</p> <p>Not for use by third-party applications.</p>
@hide --> @hide -->

3
packages/Shell/AndroidManifest.xml
View File

@@ -323,6 +323,9 @@
<!-- Permissions required for CTS test - AdbManagerTest --> <!-- Permissions required for CTS test - AdbManagerTest -->
<uses-permission android:name="android.permission.MANAGE_DEBUGGING" /> <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" <application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight" android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"