Merge "Fixing isOpRestricted in AppOpsService" into nyc-dev (653e7bed) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -1316,8 +1316,8 @@ public class AppOpsService extends IAppOpsService.Stub {
		// For each client, check that the given op is not restricted, or that the given
		// package is exempt from the restriction.
		ClientRestrictionState restrictionState = mOpUserRestrictions.valueAt(i);
		if (restrictionState.hasRestriction(code, packageName, userHandle)
		&& AppOpsManager.opAllowSystemBypassRestriction(code)) {
		if (restrictionState.hasRestriction(code, packageName, userHandle)) {
		if (AppOpsManager.opAllowSystemBypassRestriction(code)) {
		// If we are the system, bypass user restrictions for certain codes
		synchronized (this) {
		Ops ops = getOpsRawLocked(uid, packageName, true);
		@@ -1325,6 +1325,7 @@ public class AppOpsService extends IAppOpsService.Stub {
		return false;
		}
		}
		}
		return true;
		}
		}