commit 83ea23b90597f39f5f8f899023ae099eab0e98e2
author Amit Mahajan <amitmahajan@google.com> Thu Jul 30 16:05:11 2015 -0700
committer Amit Mahajan <amitmahajan@google.com> Thu Jul 30 16:05:11 2015 -0700
tree e4687f3fed46897e7f2dd5645e137c818fdde1af
parent 011676f979e1f0c8fd2d042a38e21cde5852789e

Add OrSelf to privileged permission check.

Bug: 22857263
Change-Id: Ide7105dfd653e3c271330822fb8cee7cf620e35d

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 750a025..fdf16d2 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,
@@ -2713,10 +2703,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,