Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bc25695 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "Use noteOpNoThrow instead in AMS" into oc-mr1-dev 

am: d3293ab4

Change-Id: I7f4eda96cba30740edf82505e0dc9b94d9e4bd51
parents 157906f7 d3293ab4

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;

                }