Merge "Add MANAGE_APP_HIBERNATION permission" into sc-dev (44a573f7) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ package android {
		field public static final String MANAGE_ACCESSIBILITY = "android.permission.MANAGE_ACCESSIBILITY";
		field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
		field public static final String MANAGE_ACTIVITY_TASKS = "android.permission.MANAGE_ACTIVITY_TASKS";
		field public static final String MANAGE_APP_HIBERNATION = "android.permission.MANAGE_APP_HIBERNATION";
		field public static final String MANAGE_APP_OPS_RESTRICTIONS = "android.permission.MANAGE_APP_OPS_RESTRICTIONS";
		field public static final String MANAGE_APP_PREDICTIONS = "android.permission.MANAGE_APP_PREDICTIONS";
		field public static final String MANAGE_APP_TOKENS = "android.permission.MANAGE_APP_TOKENS";
		@@ -1831,10 +1832,10 @@ package android.app.usage {
		package android.apphibernation {

		public final class AppHibernationManager {
		method public boolean isHibernatingForUser(@NonNull String);
		method public boolean isHibernatingGlobally(@NonNull String);
		method public void setHibernatingForUser(@NonNull String, boolean);
		method public void setHibernatingGlobally(@NonNull String, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_APP_HIBERNATION) public boolean isHibernatingForUser(@NonNull String);
		method @RequiresPermission(android.Manifest.permission.MANAGE_APP_HIBERNATION) public boolean isHibernatingGlobally(@NonNull String);
		method @RequiresPermission(android.Manifest.permission.MANAGE_APP_HIBERNATION) public void setHibernatingForUser(@NonNull String, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_APP_HIBERNATION) public void setHibernatingGlobally(@NonNull String, boolean);
		}

		}

core/java/android/apphibernation/AppHibernationManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.apphibernation;

		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.content.Context;
		@@ -54,6 +55,7 @@ public final class AppHibernationManager {
		* @hide
		*/
		@SystemApi
		@RequiresPermission(value = android.Manifest.permission.MANAGE_APP_HIBERNATION)
		public boolean isHibernatingForUser(@NonNull String packageName) {
		try {
		return mIAppHibernationService.isHibernatingForUser(packageName, mContext.getUserId());
		@@ -68,6 +70,7 @@ public final class AppHibernationManager {
		* @hide
		*/
		@SystemApi
		@RequiresPermission(value = android.Manifest.permission.MANAGE_APP_HIBERNATION)
		public void setHibernatingForUser(@NonNull String packageName, boolean isHibernating) {
		try {
		mIAppHibernationService.setHibernatingForUser(packageName, mContext.getUserId(),
		@@ -83,6 +86,7 @@ public final class AppHibernationManager {
		* @hide
		*/
		@SystemApi
		@RequiresPermission(value = android.Manifest.permission.MANAGE_APP_HIBERNATION)
		public boolean isHibernatingGlobally(@NonNull String packageName) {
		try {
		return mIAppHibernationService.isHibernatingGlobally(packageName);
		@@ -99,6 +103,7 @@ public final class AppHibernationManager {
		* @hide
		*/
		@SystemApi
		@RequiresPermission(value = android.Manifest.permission.MANAGE_APP_HIBERNATION)
		public void setHibernatingGlobally(@NonNull String packageName, boolean isHibernating) {
		try {
		mIAppHibernationService.setHibernatingGlobally(packageName, isHibernating);

core/res/AndroidManifest.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -5546,6 +5546,10 @@
		<permission android:name="android.permission.ACCESS_LOCUS_ID_USAGE_STATS"
		android:protectionLevel="signature\|appPredictor" />

		<!-- @hide @SystemApi Allows an application to manage app hibernation state. -->
		<permission android:name="android.permission.MANAGE_APP_HIBERNATION"
		android:protectionLevel="signature\|installer" />

		<!-- @hide @TestApi Allows apps to reset the state of {@link com.android.server.am.AppErrors}.
		<p>CTS tests will use UiAutomation.adoptShellPermissionIdentity() to gain access. -->
		<permission android:name="android.permission.RESET_APP_ERRORS"

data/etc/privapp-permissions-platform.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -492,6 +492,7 @@ applications that come with the platform
		<permission name="android.permission.UPDATE_FONTS" />
		<!-- Permission required for hotword detection service CTS tests -->
		<permission name="android.permission.MANAGE_HOTWORD_DETECTION" />
		<permission name="android.permission.MANAGE_APP_HIBERNATION"/>
		</privapp-permissions>

		<privapp-permissions package="com.android.statementservice">

packages/Shell/AndroidManifest.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -433,6 +433,8 @@
		<!-- Permission required for hotword detection service CTS tests -->
		<uses-permission android:name="android.permission.MANAGE_HOTWORD_DETECTION" />

		<uses-permission android:name="android.permission.MANAGE_APP_HIBERNATION"/>

		<application android:label="@string/app_label"
		android:theme="@android:style/Theme.DeviceDefault.DayNight"
		android:defaultToDeviceProtectedStorage="true"