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

Commit 4607fff2 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Added builder for SubscriptionInfo"

parents 7f696b8c 27209094

telephony/java/android/telephony/SubscriptionInfo.java

+930 −293

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/SubscriptionManager.java

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

    @SystemApi

    public boolean canManageSubscription(@NonNull SubscriptionInfo info,

    public boolean canManageSubscription(@NonNull SubscriptionInfo info,

            @NonNull String packageName) {

            @NonNull String packageName) {

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

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

            return false;

            return false;

        }

        }

        PackageManager packageManager = mContext.getPackageManager();

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

            logd("Unknown package: " + packageName);

            return false;

            return false;

        }

        }

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

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

            if (rule.getCarrierPrivilegeStatus(packageInfo)

            if (rule.getCarrierPrivilegeStatus(packageInfo)

                    == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {

                    == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {

                return true;

                return true;