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

This commit is contained in:
Aishwarya Mallampati
2023-06-06 20:35:30 +00:00
committed by Android (Google) Code Review

View File

@@ -18,6 +18,7 @@ package android.telephony;
import static android.text.TextUtils.formatSimple; import static android.text.TextUtils.formatSimple;
import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
@@ -696,6 +697,15 @@ public class SubscriptionInfo implements Parcelable {
return merged.isEmpty() ? null : merged; return merged.isEmpty() ? null : merged;
} }
/**
* @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. * Returns the card string of the SIM card which contains the subscription.
* *