Merge "UID appop state should always override package appop" into nyc-dev (6c773c5d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/AppOpsService.java

+12 −8

Original line number	Diff line number	Diff line
		@@ -1046,7 +1046,9 @@ public class AppOpsService extends IAppOpsService.Stub {
		op.duration = 0;
		final int switchCode = AppOpsManager.opToSwitch(code);
		UidState uidState = ops.uidState;
		if (uidState.opModes != null) {
		// If there is a non-default per UID policy (we set UID op mode only if
		// non-default) it takes over, otherwise use the per package policy.
		if (uidState.opModes != null && uidState.opModes.indexOfKey(switchCode) >= 0) {
		final int uidMode = uidState.opModes.get(switchCode);
		if (uidMode != AppOpsManager.MODE_ALLOWED) {
		if (DEBUG) Log.d(TAG, "noteOperation: reject #" + op.mode + " for code "
		@@ -1055,14 +1057,16 @@ public class AppOpsService extends IAppOpsService.Stub {
		op.rejectTime = System.currentTimeMillis();
		return uidMode;
		}
		}
		} else {
		final Op switchOp = switchCode != code ? getOpLocked(ops, switchCode, true) : op;
		if (switchOp.mode != AppOpsManager.MODE_ALLOWED) {
		if (DEBUG) Log.d(TAG, "noteOperation: reject #" + op.mode + " for code "
		+ switchCode + " (" + code + ") uid " + uid + " package " + packageName);
		+ switchCode + " (" + code + ") uid " + uid + " package "
		+ packageName);
		op.rejectTime = System.currentTimeMillis();
		return switchOp.mode;
		}
		}
		if (DEBUG) Log.d(TAG, "noteOperation: allowing code " + code + " uid " + uid
		+ " package " + packageName);
		op.time = System.currentTimeMillis();