Merge "Revert "Adds wrapper method to convert string ops to ints"" (efcda865) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -315,7 +315,6 @@ package android.app {
		method public android.app.AppOpsManager.HistoricalPackageOps getHistoricalPackagesOps(int, java.lang.String, java.lang.String[], long, long);
		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 setMode(java.lang.String, int, java.lang.String, int);

+0 −24

Original line number	Diff line number	Diff line
		@@ -2501,30 +2501,6 @@ public class AppOpsManager {
		}
		}

		/**
		* Retrieve current operation state for all applications.
		*
		* @param ops The set of operations you are interested in, or null if you want all of them.
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS)
		@SystemApi
		public List<AppOpsManager.PackageOps> getPackagesForOpStrs(String[] ops) {
		if (ops == null) {
		return getPackagesForOps(null);
		}
		final int[] opCodes = new int[ops.length];
		for (int i = 0; i < ops.length; ++i) {
		final Integer opCode = sOpStrToOp.get(ops[i]);
		if (opCode == null) {
		opCodes[i] = OP_NONE;
		} else {
		opCodes[i] = opCode;
		}
		}
		return getPackagesForOps(opCodes);
		}

		/**
		* Retrieve current operation state for one application.
		*