commit 13273bdd238afc27993a5b4bcf9bf9f29a83f91d
author Amit Mahajan <amitmahajan@google.com> Fri Jul 31 00:18:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 31 00:18:10 2015 +0000
tree 05cd9c0d4e8589cb436a228cf220218b288815c1
parent 0c9e3c8a9d944857141398c00660bef13cf8b0f4
parent 2def5029e966344a0ddd3c7e45a3a2c9ced084af

am 2def5029: am 8954f472: am 83ea23b9: Add OrSelf to privileged permission check.

* commit '2def5029e966344a0ddd3c7e45a3a2c9ced084af':
  Add OrSelf to privileged permission check.

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 7b8f5d5..c59f60d 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1616,16 +1616,6 @@
         mApp.enforceCallingOrSelfPermission(android.Manifest.permission.CALL_PHONE, null);
     }
 
-    /**
-     * Make sure the caller has the READ_PRIVILEGED_PHONE_STATE permission.
-     *
-     * @throws SecurityException if the caller does not have the required permission
-     */
-    private void enforcePrivilegedPhoneStatePermission() {
-        mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
-                null);
-    }
-
     private void enforceConnectivityInternalPermission() {
         mApp.enforceCallingOrSelfPermission(
                 android.Manifest.permission.CONNECTIVITY_INTERNAL,
@@ -2720,10 +2710,10 @@
 
     private boolean canReadPhoneState(String callingPackage, String message) {
         try {
-            mApp.enforceCallingPermission(
+            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 caller or self has PRIVILEDGED permission
             return true;
         } catch (SecurityException e) {
             mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,