commit ae97d19c3e0f080bc7e92e3b71f9e17356e8e7fc
author Nate Myren <ntmyren@google.com> Fri Jun 09 15:22:31 2023 -0700
committer Nate Myren <ntmyren@google.com> Tue Oct 03 12:59:55 2023 -0700
tree 30f716f665651ed84bf55c89a4c2f7a9b801a29f
parent a40ca935984cd62a78e894f6cffe91227dd6d8e0

Note OP_ENABLE_MOBILE_DATA_BY_USER when user enables mobile data

Bug: 222650148
Test: atest PhoneInterfaceManagerTest
Change-Id: Ic123ebe5ddf2d37e7479a8247de5ca9f3165cfce

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6c5e916..adb4203 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -17,6 +17,7 @@
 package com.android.phone;
 
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static android.permission.flags.Flags.opEnableMobileDataByUser;
 import static android.telephony.TelephonyManager.HAL_SERVICE_NETWORK;
 import static android.telephony.TelephonyManager.HAL_SERVICE_RADIO;
 
@@ -8824,6 +8825,12 @@
             enforceModifyPermission();
         }
 
+        if (reason == TelephonyManager.DATA_ENABLED_REASON_USER && enabled
+                && null != callingPackage && opEnableMobileDataByUser()) {
+            mAppOps.noteOp(AppOpsManager.OPSTR_ENABLE_MOBILE_DATA_BY_USER, Binder.getCallingUid(),
+                    callingPackage, null, null);
+        }
+
         final long identity = Binder.clearCallingIdentity();
         try {
             Phone phone = getPhone(subId);