commit 70af6dce4e96e4265e534e88051972f5f89307c1
author Michael Groover <mpgroover@google.com> Mon Oct 01 16:23:15 2018 -0700
committer Michael Groover <mpgroover@google.com> Thu Oct 04 15:10:24 2018 -0700
tree 834a02d863fc3f40fe7feda59e9c837206aee62d
parent 905a466c5a52750307340ec4fe3ce39ef16ef75c

Protect Device Identifiers behind priv permission and DO/PO checks

Bug: 110099294
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases \
      -t com.android.cts.devicepolicy.DeviceOwnerTest.testDeviceOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases \
      -t com.android.cts.devicepolicy.ManagedProfileTest#testGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest
Test: cts-tradefed run cts -m CtsPermissionTestCases -t android.permission.cts.TelephonyManagerPermissionTest

Change-Id: Ifb55b6fe448a9b19e1368d3b2a375729298add86

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f2bc7d3..7735f3a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1891,8 +1891,8 @@
             return null;
         }
         int subId = phone.getSubId();
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "getImeiForSlot")) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadDeviceIdentifiers(mApp, subId,
+                callingPackage, "getImeiForSlot")) {
             return null;
         }
 
@@ -1922,8 +1922,8 @@
             return null;
         }
         int subId = phone.getSubId();
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "getMeidForSlot")) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadDeviceIdentifiers(mApp, subId,
+                callingPackage, "getMeidForSlot")) {
             return null;
         }
 
@@ -4046,8 +4046,8 @@
             return null;
         }
         int subId = phone.getSubId();
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "getDeviceId")) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadDeviceIdentifiers(mApp, subId,
+                callingPackage, "getDeviceId")) {
             return null;
         }