commit f342a983401126326e6c10001303cb940b12a696
author Chad Brubaker <cbrubaker@google.com> Thu Mar 30 16:27:34 2017 -0700
committer Chad Brubaker <cbrubaker@google.com> Thu Mar 30 16:27:34 2017 -0700
tree b2964096d9ac8e819188f651df4313d19c09ba42
parent 9370f24e801d8ad6d8e08be1f20301fe15301b55

Track rename of READ_PHONE_NUMBERS

Bug: 35853790
Test: See framework CL
Change-Id: I16aef5436e40903932dceca6a590a9ae9da4d354

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 27e365f..8ac8764 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3281,11 +3281,11 @@
             }
         } catch (SecurityException readSmsSecurityException) {
         }
-        // Can be read with READ_PHONE_NUMBER too.
+        // Can be read with READ_PHONE_NUMBERS too.
         try {
-            mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_NUMBER,
+            mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_NUMBERS,
                     message);
-            int opCode = mAppOps.permissionToOpCode(android.Manifest.permission.READ_PHONE_NUMBER);
+            int opCode = mAppOps.permissionToOpCode(android.Manifest.permission.READ_PHONE_NUMBERS);
             if (opCode != AppOpsManager.OP_NONE) {
                 return mAppOps.noteOp(opCode, Binder.getCallingUid(), callingPackage)
                         == AppOpsManager.MODE_ALLOWED;
@@ -3298,7 +3298,7 @@
         throw new SecurityException(message + ": Neither user " + Binder.getCallingUid() +
                 " nor current process has" + android.Manifest.permission.READ_PHONE_STATE +
                 ", " + android.Manifest.permission.READ_SMS + ", or " +
-                android.Manifest.permission.READ_PHONE_NUMBER);
+                android.Manifest.permission.READ_PHONE_NUMBERS);
     }
 
     @Override