commit 43d23ef3875d6f605c541ef6cafc5db1b891ea52
author Amit Mahajan <amitmahajan@google.com> Mon Jul 13 22:06:03 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 13 22:07:13 2015 +0000
tree bc3f82a44ad640213f07974f683c58488695477f
parent c362ec4bf57aa460db78b747c9e36231fc8a0d0a
parent 15fc854d77093a29e354a98a3eeb3a0456718484

Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." 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 d9680cf..8273e1e 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2713,10 +2713,10 @@
 
     private boolean canReadPhoneState(String callingPackage, String message) {
         try {
-            mApp.enforceCallingOrSelfPermission(
+            mApp.enforceCallingPermission(
                     android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);
 
-            // SKIP checking for run-time permission since self or obtained PRIVILEDGED
+            // SKIP checking for run-time permission since obtained PRIVILEDGED
             return true;
         } catch (SecurityException e) {
             mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,