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

Commit a4466cc4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Added builder for SubscriptionInfo"

parents 2aba2a12 9f6f2310

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;