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

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

Merge "Revert "Added builder for SubscriptionInfo""

parents c78e7fc6 daa7679e

telephony/java/android/telephony/SubscriptionInfo.java

+292 −929

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.getAccessRules() == null || packageName == null) {

        if (info == null || info.getAllAccessRules() == 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.getAccessRules()) {

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

            if (rule.getCarrierPrivilegeStatus(packageInfo)

                    == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {

                return true;