commit 799f6e9874d468cda64d48d042d50b5405e6fb0b
author goneil <goneil@google.com> Wed Dec 13 12:57:23 2017 -0800
committer goneil <goneil@google.com> Thu Dec 21 10:22:21 2017 -0800
tree fad012f63ce392ba8de520b9254f9613b1c34f23
parent 73015f486600fb0894391dff97e8aafbc8aa4061

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

Bug: 67750905
Test: TelephonyManagerTests#test{Voice/Data}ActivationState
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 6e2afc5..50022a5 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2093,9 +2093,7 @@
      */
     @Override
     public int getVoiceActivationState(int subId, String callingPackage) {
-        if (!canReadPhoneState(callingPackage, "getVoiceActivationStateForSubscriber")) {
-            return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
-        }
+        enforceReadPrivilegedPermission();
         final Phone phone = getPhone(subId);
         if (phone != null) {
             return phone.getVoiceActivationState();
@@ -2109,9 +2107,7 @@
      */
     @Override
     public int getDataActivationState(int subId, String callingPackage) {
-        if (!canReadPhoneState(callingPackage, "getDataActivationStateForSubscriber")) {
-            return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
-        }
+        enforceReadPrivilegedPermission();
         final Phone phone = getPhone(subId);
         if (phone != null) {
             return phone.getDataActivationState();