commit f250974d7ec69a6c62471d35c03e3188287b9c7e
author Amit Mahajan <amitmahajan@google.com> Mon Oct 07 16:20:43 2019 -0700
committer Amit Mahajan <amitmahajan@google.com> Fri Nov 01 14:18:03 2019 -0700
tree 912a08fc2057a7a507d12bfd53cddd90091f7234
parent 99a92f6c1813adb2331530bf074d46f6d9585996

Make isDataEnabledForApn() a system api.

Test: atest TelephonyManagerTest#testIsDataEnabledForApn
Bug: 140763963
Merged-in: I816972df567dd210822edc30f9434a39c7815e46
Change-Id: I816972df567dd210822edc30f9434a39c7815e46
(cherry picked from commit 5d4e1921a562dc77712b925424181846746e9ad8)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ce31536..3ecd6b4 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7331,10 +7331,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();