commit def72ce1b27cc2577d44df097dfccc05c77db0fb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 19 01:36:32 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 19 01:36:32 2023 +0000
tree 6ab377c21a9227c077fe7707c570cc95a6f93968
parent 4177e77fc2014b61558bc42c4e47e49e97488c3d
parent cdbd29aa0b32c5d79eb342b2f46d2fe47cc2a965

Snap for 9966400 from cdbd29aa0b32c5d79eb342b2f46d2fe47cc2a965 to udc-release

Change-Id: I8356cfa30b2da1d40e78df7b4527c11b9b4be389

src/com/android/ons/OpportunisticNetworkService.java

diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java
index 485722f..d41051c 100644
--- a/src/com/android/ons/OpportunisticNetworkService.java
+++ b/src/com/android/ons/OpportunisticNetworkService.java
@@ -313,10 +313,19 @@
         @Override
         public int getPreferredDataSubscriptionId(String callingPackage,
                 String callingFeatureId) {
-            TelephonyPermissions
-                    .checkCallingOrSelfReadPhoneState(mContext,
-                            mSubscriptionManager.getDefaultSubscriptionId(),
-                            callingPackage, callingFeatureId, "getPreferredDataSubscriptionId");
+            if (!TelephonyPermissions.checkReadPhoneStateOnAnyActiveSub(
+                    mContext,
+                    Binder.getCallingPid(),
+                    Binder.getCallingUid(),
+                    callingPackage,
+                    callingFeatureId,
+                    "getPreferredDataSubscriptionId")) {
+                throw new SecurityException(
+                        "getPreferredDataSubscriptionId requires READ_PHONE_STATE,"
+                        + " READ_PRIVILEGED_PHONE_STATE, or carrier privileges on"
+                        + " any active subscription.");
+            }
+
             final long identity = Binder.clearCallingIdentity();
             try {
                 return mProfileSelector.getPreferredDataSubscriptionId();