commit 0bae92415fd20a27620d2b48d926329b81a40301
author Amit Mahajan <amitmahajan@google.com> Mon Jun 29 18:02:03 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 29 18:02:05 2015 +0000
tree a29cb70808addcf19e882e447800ffddd4040898
parent b7a0634a8e317bcc5be2d245dc5823e5b73e6d24
parent 785783f758260e5d23633317f1a286a89d66090d

Merge "Change the order of permission checks for READ_PHONE_STATE." into mnc-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ea44511..359535e 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2651,19 +2651,15 @@
     }
 
     private boolean canReadPhoneState(String callingPackage, String message) {
-        boolean failReadPhoneState = false;
         try {
-            mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
-                    message);
-        } catch (SecurityException e) {
-            failReadPhoneState = true;
-        }
-        if (failReadPhoneState) {
             mApp.enforceCallingOrSelfPermission(
                     android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);
 
-            // SKIP checking for run-time permission since obtained PRIVILEDGED
+            // SKIP checking for run-time permission since self or obtained PRIVILEDGED
             return true;
+        } catch (SecurityException e) {
+            mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
+                    message);
         }
 
         if (mAppOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, Binder.getCallingUid(),