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

Commit 20f007c3 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service" 

* changes:
  Added builder for SubscriptionInfo
  Added empty subscription manager service
parents 9ca50dba 6a0a3326

core/res/res/values/config_telephony.xml

+4 −0
Original line number Diff line number Diff line
@@ -113,4 +113,8 @@ 
         new network. -->

    <bool name="config_enhanced_iwlan_handover_check">true</bool>

    <java-symbol type="bool" name="config_enhanced_iwlan_handover_check" />



    <!-- Whether using the new SubscriptionManagerService or the old SubscriptionController -->

    <bool name="config_using_subscription_manager_service">false</bool>

    <java-symbol type="bool" name="config_using_subscription_manager_service" />

</resources>

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;