Merge "Work around per-package app op mode set for runtime permission app op." (8f2e6498) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PermissionPolicyService.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -677,10 +677,19 @@ public final class PermissionPolicyService extends SystemService {

		private void setUidMode(int opCode, int uid, int mode,
		@NonNull String packageName) {
		final int currentMode = mAppOpsManager.unsafeCheckOpRaw(AppOpsManager
		.opToPublicName(opCode), uid, packageName);
		if (currentMode != mode) {
		final int oldMode = mAppOpsManager.unsafeCheckOpRaw(AppOpsManager.opToPublicName(
		opCode), uid, packageName);
		if (oldMode != mode) {
		mAppOpsManager.setUidMode(opCode, uid, mode);
		final int newMode = mAppOpsManager.unsafeCheckOpRaw(AppOpsManager.opToPublicName(
		opCode), uid, packageName);
		if (newMode != mode) {
		// Work around incorrectly-set package mode. It never makes sense for app ops
		// related to runtime permissions, but can get in the way and we have to reset
		// it.
		mAppOpsManager.setMode(opCode, uid, packageName, AppOpsManager.opToDefaultMode(
		opCode));
		}
		}
		}