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

Commit f61428cf authored by Antony Sargent's avatar Antony Sargent Committed by android-build-merger
Browse files

Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev 

am: 20ec6a4b

Change-Id: I72317d0d45103cbc4791e1f9d67e726d7426b758
parents aaae63aa 20ec6a4b

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

+7 −0
Original line number Diff line number Diff line
@@ -76,6 +76,13 @@ public class MobileNetworkActivity extends SettingsBaseActivity { 
        }

    };



    @Override

    protected void onNewIntent(Intent intent) {

        super.onNewIntent(intent);

        setIntent(intent);

        updateSubscriptions(null);

    }



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

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

+17 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ import android.view.View; 
import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.view.menu.ContextMenuBuilder;

import com.android.settings.R;

import com.android.settings.core.FeatureFlags;

import com.android.settings.development.featureflags.FeatureFlagPersistent;

import com.android.settings.network.SubscriptionUtil;



import com.google.android.material.bottomnavigation.BottomNavigationView;
@@ -207,4 +209,19 @@ public class MobileNetworkActivityTest { 


        assertThat(bundle.getInt(Settings.EXTRA_SUB_ID)).isEqualTo(PREV_SUB_ID);

    }



    @Test

    public void onNewIntent_newSubscriptionId_fragmentReplaced() {

        FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, true);



        mSubscriptionInfos.add(mSubscriptionInfo);

        mSubscriptionInfos.add(mSubscriptionInfo2);

        SubscriptionUtil.setAvailableSubscriptionsForTesting(mSubscriptionInfos);

        mMobileNetworkActivity.mCurSubscriptionId = PREV_SUB_ID;



        final Intent newIntent = new Intent();

        newIntent.putExtra(Settings.EXTRA_SUB_ID, CURRENT_SUB_ID);

        mMobileNetworkActivity.onNewIntent(newIntent);

        assertThat(mMobileNetworkActivity.mCurSubscriptionId).isEqualTo(CURRENT_SUB_ID);

    }

}