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

Commit ebc95977 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes from topics "subscriptionInfo_builder",... 

Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service" am: 20f007c3 am: f3db9c87

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2457667



Change-Id: I13061161053f817f06710db94c7704e9ebb1fa1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a76b2948 f3db9c87

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 Diff line number Diff line
@@ -3079,7 +3079,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();
@@ -3091,7 +3091,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;