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

Commit 10ff4f4a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Settings] Code Refactor of MobileNetworkPreferenceController" am: 52dd9f5a 

Change-Id: I90719e21019d7acb9cd208b7b282a865919be775
parents 7ecae6dd 52dd9f5a

src/com/android/settings/network/MobileNetworkPreferenceController.java

+2 −16
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import static android.os.UserHandle.myUserId; 
import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;



import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;
@@ -28,13 +27,11 @@ import android.provider.Settings; 
import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.TelephonyManager;

import android.util.FeatureFlagUtils;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.core.FeatureFlags;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.network.telephony.MobileNetworkActivity;

import com.android.settings.network.telephony.MobileNetworkUtils;
@@ -51,10 +48,6 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl 


    @VisibleForTesting

    static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";

    @VisibleForTesting

    static final String MOBILE_NETWORK_PACKAGE = "com.android.phone";

    @VisibleForTesting

    static final String MOBILE_NETWORK_CLASS = "com.android.phone.MobileNetworkSettings";



    private final boolean mIsSecondaryUser;

    private final TelephonyManager mTelephonyManager;
@@ -147,15 +140,8 @@ public class MobileNetworkPreferenceController extends AbstractPreferenceControl 
    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        if (KEY_MOBILE_NETWORK_SETTINGS.equals(preference.getKey())) {

            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.MOBILE_NETWORK_V2)) {

            final Intent intent = new Intent(mContext, MobileNetworkActivity.class);

            mContext.startActivity(intent);

            } else {

                final Intent intent = new Intent(Intent.ACTION_MAIN);

                intent.setComponent(

                        new ComponentName(MOBILE_NETWORK_PACKAGE, MOBILE_NETWORK_CLASS));

                mContext.startActivity(intent);

            }

            return true;

        }

        return false;

tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java

+8 −27
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ package com.android.settings.network; 
import static androidx.lifecycle.Lifecycle.Event.ON_START;

import static androidx.lifecycle.Lifecycle.Event.ON_STOP;



import static com.android.settings.network.MobileNetworkPreferenceController.MOBILE_NETWORK_CLASS;

import static com.android.settings.network.MobileNetworkPreferenceController.MOBILE_NETWORK_PACKAGE;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.doReturn;
@@ -30,23 +27,19 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;

import static org.robolectric.shadow.api.Shadow.extract;



import android.app.Activity;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.net.ConnectivityManager;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.telephony.PhoneStateListener;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.util.FeatureFlagUtils;



import androidx.lifecycle.LifecycleOwner;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.core.FeatureFlags;

import com.android.settings.testutils.shadow.ShadowConnectivityManager;

import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -56,11 +49,10 @@ import com.android.settingslib.core.lifecycle.Lifecycle; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)
@@ -71,6 +63,8 @@ public class MobileNetworkPreferenceControllerTest { 
    @Mock

    private TelephonyManager mTelephonyManager;

    @Mock

    private SubscriptionManager mSubscriptionManager;

    @Mock

    private PreferenceScreen mScreen;



    private Lifecycle mLifecycle;
@@ -81,10 +75,11 @@ public class MobileNetworkPreferenceControllerTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(Robolectric.setupActivity(Activity.class));

        mContext = spy(RuntimeEnvironment.application);

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);

        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);

        mPreference = new Preference(mContext);

        mPreference.setKey(MobileNetworkPreferenceController.KEY_MOBILE_NETWORK_SETTINGS);

    }
@@ -145,8 +140,8 @@ public class MobileNetworkPreferenceControllerTest { 
        verify(mTelephonyManager).listen(mController.mPhoneStateListener,

                PhoneStateListener.LISTEN_SERVICE_STATE);



        // Trigger listener update

        when(mTelephonyManager.getNetworkOperatorName()).thenReturn(testCarrierName);

        doReturn(testCarrierName).when(mController).getSummary();



        mController.mPhoneStateListener.onServiceStateChanged(null);



        // Carrier name should be set.
@@ -184,18 +179,4 @@ public class MobileNetworkPreferenceControllerTest { 
        mController.updateState(mPreference);

        assertThat(mPreference.isEnabled()).isFalse();

    }



    @Test

    public void handlePreferenceTreeClick_mobileFeatureDisabled_sendIntent() {

        mController = new MobileNetworkPreferenceController(mContext);

        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.MOBILE_NETWORK_V2, false);

        ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);



        mController.handlePreferenceTreeClick(mPreference);



        verify(mContext).startActivity(argument.capture());

        final ComponentName componentName = argument.getValue().getComponent();

        assertThat(componentName.getPackageName()).isEqualTo(MOBILE_NETWORK_PACKAGE);

        assertThat(componentName.getClassName()).isEqualTo(MOBILE_NETWORK_CLASS);

    }

}