commit dc9a83668a663d79b44c2d311bf4a7b49e3740cb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 02 23:18:17 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 02 23:18:17 2021 +0000
tree f4c46b5781224498ba31710b61faf6af6d397c37
parent 191552ddccb94f41039b5f593316294a5e80542b
parent 72a22764d4e8df2d1ae19d02e2fa363d93984a0e

Merge "Verify carrier privilege for isDataEnabledForReason"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a0b2277..4eae7ec 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6663,8 +6663,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");
+            }
         }