Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-qpr-dev

1 files changed, 10 insertions, 0 deletions

diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index 90d7a161767c..a8a7f36525a9 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -16,6 +16,7 @@
 
 package android.telephony;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.compat.annotation.UnsupportedAppUsage;
@@ -694,6 +695,15 @@ public class SubscriptionInfo implements Parcelable {
     }
 
     /**
+     * @hide
+     * @return mCarrierConfigAccessRules associated with this subscription.
+     */
+    public @NonNull List<UiccAccessRule> getCarrierConfigAccessRules() {
+        return mCarrierConfigAccessRules == null ? Collections.emptyList() :
+            Arrays.asList(mCarrierConfigAccessRules);
+    }
+
+    /**
      * Returns the card string of the SIM card which contains the subscription.
      *
      * Starting with API level 30, returns the card string if the calling app has been granted the