commit 5d4e1921a562dc77712b925424181846746e9ad8
author Amit Mahajan <amitmahajan@google.com> Mon Oct 07 16:20:43 2019 -0700
committer Amit Mahajan <amitmahajan@google.com> Mon Oct 07 16:20:43 2019 -0700
tree 3af7c3ab357eb65ed955f4356d1c7828e3302a3c
parent e07098984d26a3ba8fa6b1525b199741f2d0e153

Make isDataEnabledForApn() a system api.

Test: atest TelephonyManagerTest#testIsDataEnabledForApn
Bug: 140763963
Change-Id: I816972df567dd210822edc30f9434a39c7815e46

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a847d66..09b673b 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7222,10 +7222,8 @@
      */
     @Override
     public boolean isDataEnabledForApn(int apnType, int subId, String callingPackage) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "isDataEnabledForApn")) {
-            throw new SecurityException("Needs READ_PHONE_STATE for isDataEnabledForApn");
-        }
+        enforceReadPrivilegedPermission("Needs READ_PRIVILEGED_PHONE_STATE for "
+                + "isDataEnabledForApn");
 
         // Now that all security checks passes, perform the operation as ourselves.
         final long identity = Binder.clearCallingIdentity();