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

Commit 976dca21 authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default... 

Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice"
parents 595b8f3b a8d56184

src/com/android/settings/datausage/DataUsageUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -159,11 +159,12 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU 
     * SubscriptionManager#INVALID_SUBSCRIPTION_ID

     */

    public static int getDefaultSubscriptionId(Context context) {

        SubscriptionManager subManager = SubscriptionManager.from(context);

        SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);

        if (subManager == null) {

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        }

        SubscriptionInfo subscriptionInfo = subManager.getDefaultDataSubscriptionInfo();

        SubscriptionInfo subscriptionInfo =

                subManager.getActiveSubscriptionInfo(subManager.getDefaultDataSubscriptionId());

        if (subscriptionInfo == null) {

            List<SubscriptionInfo> list = subManager.getAllSubscriptionInfoList();

            if (list.size() == 0) {

src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class CallsDefaultSubscriptionController extends DefaultSubscriptionContr 


    @Override

    protected SubscriptionInfo getDefaultSubscriptionInfo() {

        return mManager.getDefaultVoiceSubscriptionInfo();

        return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());

    }



    @Override

src/com/android/settings/network/telephony/MobileDataDialogFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ public class MobileDataDialogFragment extends InstrumentedDialogFragment impleme 
                final SubscriptionInfo currentSubInfo =

                        mSubscriptionManager.getActiveSubscriptionInfo(mSubId);

                final SubscriptionInfo nextSubInfo =

                        mSubscriptionManager.getDefaultDataSubscriptionInfo();

                        mSubscriptionManager.getActiveSubscriptionInfo(

                                mSubscriptionManager.getDefaultDataSubscriptionId());



                final String previousName = (nextSubInfo == null)

                        ? getContext().getResources().getString(

src/com/android/settings/network/telephony/MobileDataSlice.java

+4 −4
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ public class MobileDataSlice implements CustomSliceable { 
    }



    protected static int getDefaultSubscriptionId(SubscriptionManager subscriptionManager) {

        final SubscriptionInfo defaultSubscription =

                subscriptionManager.getDefaultDataSubscriptionInfo();

        final SubscriptionInfo defaultSubscription = subscriptionManager.getActiveSubscriptionInfo(

                subscriptionManager.getDefaultDataSubscriptionId());

        if (defaultSubscription == null) {

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID; // No default subscription

        }
@@ -157,8 +157,8 @@ public class MobileDataSlice implements CustomSliceable { 
    }



    private CharSequence getSummary() {

        final SubscriptionInfo defaultSubscription =

                mSubscriptionManager.getDefaultDataSubscriptionInfo();

        final SubscriptionInfo defaultSubscription = mSubscriptionManager.getActiveSubscriptionInfo(

                mSubscriptionManager.getDefaultDataSubscriptionId());

        if (defaultSubscription == null) {

            return null; // no summary text

        }

src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class SmsDefaultSubscriptionController extends DefaultSubscriptionControl 


    @Override

    protected SubscriptionInfo getDefaultSubscriptionInfo() {

        return mManager.getDefaultSmsSubscriptionInfo();

        return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());

    }



    @Override