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

Commit 251329c8 authored by Betty Chang's avatar Betty Chang Committed by Gerrit 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 864bd01e 1a5351c4

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

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




    @Override

    @Override

    protected SubscriptionInfo getDefaultSubscriptionInfo() {

    protected SubscriptionInfo getDefaultSubscriptionInfo() {

        return mManager.getDefaultVoiceSubscriptionInfo();

        return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());

    }

    }





    @Override

    @Override

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

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

                final SubscriptionInfo currentSubInfo =

                        mSubscriptionManager.getActiveSubscriptionInfo(mSubId);

                        mSubscriptionManager.getActiveSubscriptionInfo(mSubId);

                final SubscriptionInfo nextSubInfo =

                final SubscriptionInfo nextSubInfo =

                        mSubscriptionManager.getDefaultDataSubscriptionInfo();

                        mSubscriptionManager.getActiveSubscriptionInfo(

                                mSubscriptionManager.getDefaultDataSubscriptionId());





                final String previousName = (nextSubInfo == null)

                final String previousName = (nextSubInfo == null)

                        ? getContext().getResources().getString(

                        ? getContext().getResources().getString(

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

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

    }





    protected static int getDefaultSubscriptionId(SubscriptionManager subscriptionManager) {

    protected static int getDefaultSubscriptionId(SubscriptionManager subscriptionManager) {

        final SubscriptionInfo defaultSubscription =

        final SubscriptionInfo defaultSubscription = subscriptionManager.getActiveSubscriptionInfo(

                subscriptionManager.getDefaultDataSubscriptionInfo();

                subscriptionManager.getDefaultDataSubscriptionId());

        if (defaultSubscription == null) {

        if (defaultSubscription == null) {

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID; // No default subscription

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID; // No default subscription

        }

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

    }





    private CharSequence getSummary() {

    private CharSequence getSummary() {

        final SubscriptionInfo defaultSubscription =

        final SubscriptionInfo defaultSubscription = mSubscriptionManager.getActiveSubscriptionInfo(

                mSubscriptionManager.getDefaultDataSubscriptionInfo();

                mSubscriptionManager.getDefaultDataSubscriptionId());

        if (defaultSubscription == null) {

        if (defaultSubscription == null) {

            return null; // no summary text

            return null; // no summary text

        }

        }

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

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




    @Override

    @Override

    protected SubscriptionInfo getDefaultSubscriptionInfo() {

    protected SubscriptionInfo getDefaultSubscriptionInfo() {

        return mManager.getDefaultSmsSubscriptionInfo();

        return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId());

    }

    }





    @Override

    @Override

tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -98,7 +98,6 @@ public class MobileDataPreferenceControllerTest { 
    public void isDialogNeeded_disableSingleSim_returnFalse() {

    public void isDialogNeeded_disableSingleSim_returnFalse() {

        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        doReturn(1).when(mTelephonyManager).getActiveModemCount();

        doReturn(1).when(mTelephonyManager).getActiveModemCount();





        assertThat(mController.isDialogNeeded()).isFalse();

        assertThat(mController.isDialogNeeded()).isFalse();
@@ -130,7 +129,6 @@ public class MobileDataPreferenceControllerTest { 
    public void onPreferenceChange_singleSim_On_shouldEnableData() {

    public void onPreferenceChange_singleSim_On_shouldEnableData() {

        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        doReturn(1).when(mTelephonyManager).getActiveModemCount();

        doReturn(1).when(mTelephonyManager).getActiveModemCount();





        mController.onPreferenceChange(mPreference, true);

        mController.onPreferenceChange(mPreference, true);
@@ -142,7 +140,6 @@ public class MobileDataPreferenceControllerTest { 
    public void onPreferenceChange_multiSim_On_shouldEnableData() {

    public void onPreferenceChange_multiSim_On_shouldEnableData() {

        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        doReturn(2).when(mTelephonyManager).getActiveModemCount();

        doReturn(2).when(mTelephonyManager).getActiveModemCount();





        mController.onPreferenceChange(mPreference, true);

        mController.onPreferenceChange(mPreference, true);