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

Commit daa7679e authored by Jack Yu's avatar Jack Yu
Browse files

Revert "Added builder for SubscriptionInfo" 

Revert "Added builder for SubscriptionInfo"

Revert submission 19946716-subscription_info_refactoring

Reason for revert: crash
Reverted Changes:
I820d47538:Added builder for SubscriptionInfo
I8eb757960:Added builder for SubscriptionInfo

Change-Id: I913585232a0709232ccf456d7bd230fcdd1d0157
parent 9f6f2310

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;