Merge "Always check eval-ed mode, not raw mode" (f6e08db0) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2335,7 +2335,7 @@ public class AppOpsService extends IAppOpsService.Stub {
		} else {
		final Op switchOp = switchCode != code ? getOpLocked(ops, switchCode, true) : op;
		final int mode = switchOp.evalMode();
		if (switchOp.mode != AppOpsManager.MODE_ALLOWED) {
		if (mode != AppOpsManager.MODE_ALLOWED) {
		if (DEBUG) Slog.d(TAG, "noteOperation: reject #" + mode + " for code "
		+ switchCode + " (" + code + ") uid " + uid + " package "
		+ packageName);