commit 9e8ba380e2524ba85291ebb40081093f63cdd2e9
author goneil <goneil@google.com> Wed Dec 13 12:57:23 2017 -0800
committer goneil <goneil@google.com> Fri Mar 30 10:59:00 2018 -0700
tree 5acbcbf95f9f2119bb948b1e2b792f3316613269
parent e7d1f2e4cd58090635691ee09d6663484e3d1237

Enforce read privileged phone state on  get{Voice/Data}ActivationState

Bug: 67750905
Test: TelephonyManagerTests#test{Voice/Data}ActivationState
Merged-In: I5f6fb9704026fdecdb12b4ac867adf02f0c73f03
Change-Id: I5f6fb9704026fdecdb12b4ac867adf02f0c73f03

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index de41481..e7f28d7 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2135,10 +2135,7 @@
      */
     @Override
     public int getVoiceActivationState(int subId, String callingPackage) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "getVoiceActivationStateForSubscriber")) {
-            return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
-        }
+        enforceReadPrivilegedPermission();
         final Phone phone = getPhone(subId);
         if (phone != null) {
             return phone.getVoiceActivationState();
@@ -2152,10 +2149,7 @@
      */
     @Override
     public int getDataActivationState(int subId, String callingPackage) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "getDataActivationStateForSubscriber")) {
-            return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
-        }
+        enforceReadPrivilegedPermission();
         final Phone phone = getPhone(subId);
         if (phone != null) {
             return phone.getDataActivationState();