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

Commit 54404003 authored Sep 21, 2020 by Marin Shalamanov Committed by Automerger Merge Worker Sep 21, 2020

Merge "Add permission to override display mode requests" am: 7fb5deb7 am:...

Merge "Add permission to override display mode requests" am: 7fb5deb7 am: 83a8725d am: 794938df

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

Change-Id: Ic8d98cad7f9c8aed2d967b0959fa0e989a763abb

parents 4250e772 794938df

api/test-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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";

core/res/AndroidManifest.xml

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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 -->

packages/Shell/AndroidManifest.xml

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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"