commit 0d909a01b8ef30886db9d7358522dba90f27fd9f
author Sooraj Sasindran <sasindran@google.com> Mon Nov 08 12:01:16 2021 -0800
committer Sooraj Sasindran <sasindran@google.com> Tue Nov 30 23:39:54 2021 -0800
tree 299ddabe376de862443b9612c73cb7d72f3be5e1
parent ecbdb382e82b67bd7054463e1b92215531994ff5

Verify carrier privilege for isDataEnabledForReason

Check for carrier privilege and modify phone state permission
for isDataEnabledForReason api

Bug: 205599503
Test: build
Change-Id: Ied669505b3558e2ad1d66f95311f89bb0fa6bbe9

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 815f90e..5003247 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6705,8 +6705,13 @@
             mApp.enforceCallingOrSelfPermission(android.Manifest.permission.ACCESS_NETWORK_STATE,
                     null);
         } catch (Exception e) {
-            mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
-                    "isDataEnabledForReason");
+            try {
+                mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
+                        "isDataEnabledForReason");
+            } catch (Exception e2) {
+                TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                        mApp, subId, "isDataEnabledForReason");
+            }
         }