Merge "Add AppOpsManager.opToDefaultMode() as system API." (ea87b1fa) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -300,8 +300,8 @@ package android.app {
		method public static java.lang.String[] getOpStrs();
		method public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, java.lang.String, int[]);
		method public java.util.List<android.app.AppOpsManager.PackageOps> getPackagesForOpStrs(java.lang.String[]);
		method public static int opToDefaultMode(java.lang.String);
		method public static java.lang.String opToPermission(java.lang.String);
		method public void resetUidMode(java.lang.String, int, boolean);
		method public void setMode(java.lang.String, int, java.lang.String, int);
		method public void setUidMode(java.lang.String, int, int);
		field public static final java.lang.String OPSTR_ACCEPT_HANDOVER = "android:accept_handover";

+14 −20

Original line number	Diff line number	Diff line
		@@ -1611,6 +1611,20 @@ public class AppOpsManager {
		return sOpDefaultMode[op];
		}

		/**
		* Retrieve the default mode for the app op.
		*
		* @param appOp The app op name
		*
		* @return the default mode for the app op
		*
		* @hide
		*/
		@SystemApi
		public static int opToDefaultMode(@NonNull String appOp) {
		return opToDefaultMode(strOpToOp(appOp));
		}

		/**
		* Retrieve the human readable mode.
		* @hide
		@@ -2483,26 +2497,6 @@ public class AppOpsManager {
		}
		}

		/**
		* Resets given app op in its default mode for app ops in the UID.
		* This applies to all apps currently in the UID or installed in this UID in the future.
		*
		* @param appOp The app op.
		* @param uid The UID for which to set the app.
		*
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_APP_OPS_MODES)
		@SystemApi
		public void resetUidMode(String appOp, int uid, boolean force) {
		int code = strOpToOp(appOp);
		if (!(opAllowsReset(code) \|\| force)) {
		return;
		}
		int mode = opToDefaultMode(code);
		setUidMode(code, uid, mode);
		}

		/** @hide */
		public void setUserRestriction(int code, boolean restricted, IBinder token) {
		setUserRestriction(code, restricted, token, /exceptionPackages/null);