Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f6f2310 authored by Jack Yu's avatar Jack Yu
Browse files

Added builder for SubscriptionInfo 

Added the builder for SubscriptionInfo, and make all members
final. This can prevent other clients accidentally modifying
the same copy of SubscriptionInfo.

Also moved getAllAccessRules into getAccessRules.

Bug: 239607619
Bug: 247140269
Test: Manual + atest SubscriptionInfoTest
Change-Id: I8eb757960375c299f7770cbed27cd0fca8e33612
parent c0740e48

telephony/java/android/telephony/SubscriptionInfo.java

+929 −292

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/SubscriptionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3099,7 +3099,7 @@ public class SubscriptionManager { 
    @SystemApi

    public boolean canManageSubscription(@NonNull SubscriptionInfo info,

            @NonNull String packageName) {

        if (info == null || info.getAllAccessRules() == null || packageName == null) {

        if (info == null || info.getAccessRules() == null || packageName == null) {

            return false;

        }

        PackageManager packageManager = mContext.getPackageManager();
@@ -3111,7 +3111,7 @@ public class SubscriptionManager { 
            logd("Unknown package: " + packageName);

            return false;

        }

        for (UiccAccessRule rule : info.getAllAccessRules()) {

        for (UiccAccessRule rule : info.getAccessRules()) {

            if (rule.getCarrierPrivilegeStatus(packageInfo)

                    == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {

                return true;