Merge "Use noteOpNoThrow instead in AMS" into oc-mr1-dev (d3293ab4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/accounts/AccountManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -5285,7 +5285,7 @@ public class AccountManagerService
		== PackageManager.PERMISSION_GRANTED) {
		// Checks runtime permission revocation.
		final int opCode = AppOpsManager.permissionToOpCode(perm);
		if (opCode == AppOpsManager.OP_NONE \|\| mAppOpsManager.noteOp(
		if (opCode == AppOpsManager.OP_NONE \|\| mAppOpsManager.noteOpNoThrow(
		opCode, uid, packageName) == AppOpsManager.MODE_ALLOWED) {
		return true;
		}
		@@ -5306,7 +5306,7 @@ public class AccountManagerService
		Log.v(TAG, " caller uid " + callingUid + " has " + perm);
		}
		final int opCode = AppOpsManager.permissionToOpCode(perm);
		if (opCode == AppOpsManager.OP_NONE \|\| mAppOpsManager.noteOp(
		if (opCode == AppOpsManager.OP_NONE \|\| mAppOpsManager.noteOpNoThrow(
		opCode, callingUid, opPackageName) == AppOpsManager.MODE_ALLOWED) {
		return true;
		}