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

Commit a99bfead authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Settings] Code refactor" am: a7a9863a 

Change-Id: Ice712f8ba7ef3cf07d70a408a9127a530514b2e7
parents 6089a148 a7a9863a

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ public class ApnPreferenceController extends TelephonyBasePreferenceController i 




    public ApnPreferenceController(Context context, String key) {

    public ApnPreferenceController(Context context, String key) {

        super(context, key);

        super(context, key);

        mCarrierConfigManager = new CarrierConfigManager(context);

        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);

        mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper()));

        mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper()));

    }

    }

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

+5 −9
Original line number Original line Diff line number Diff line
@@ -24,10 +24,8 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;





import android.app.Activity;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.os.PersistableBundle;

import android.os.PersistableBundle;
@@ -36,7 +34,6 @@ import android.telephony.CarrierConfigManager; 
import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;





import com.android.internal.telephony.PhoneConstants;

import com.android.settings.network.ApnSettings;

import com.android.settings.network.ApnSettings;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.RestrictedPreference;
@@ -46,7 +43,6 @@ import org.junit.runner.RunWith; 
import org.mockito.ArgumentCaptor;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.RuntimeEnvironment;
@@ -89,7 +85,7 @@ public class ApnPreferenceControllerTest { 




    @Test

    @Test

    public void getAvailabilityStatus_apnSettingsNotSupported_returnUnavailable() {

    public void getAvailabilityStatus_apnSettingsNotSupported_returnUnavailable() {

        doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();

        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();

        final PersistableBundle bundle = new PersistableBundle();

        final PersistableBundle bundle = new PersistableBundle();

        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, false);

        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, false);

        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);

        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
@@ -99,7 +95,7 @@ public class ApnPreferenceControllerTest { 




    @Test

    @Test

    public void getAvailabilityStatus_apnSettingsSupportedWithCDMA_returnAvailable() {

    public void getAvailabilityStatus_apnSettingsSupportedWithCDMA_returnAvailable() {

        doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();

        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();

        final PersistableBundle bundle = new PersistableBundle();

        final PersistableBundle bundle = new PersistableBundle();

        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);

        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);

        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);

        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
@@ -109,7 +105,7 @@ public class ApnPreferenceControllerTest { 




    @Test

    @Test

    public void getAvailabilityStatus_apnSettingsSupportedWithGsm_returnAvailable() {

    public void getAvailabilityStatus_apnSettingsSupportedWithGsm_returnAvailable() {

        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();

        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();

        final PersistableBundle bundle = new PersistableBundle();

        final PersistableBundle bundle = new PersistableBundle();

        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);

        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);

        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);

        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
@@ -119,7 +115,7 @@ public class ApnPreferenceControllerTest { 




    @Test

    @Test

    public void getAvailabilityStatus_carrierConfigNull_returnUnavailable() {

    public void getAvailabilityStatus_carrierConfigNull_returnUnavailable() {

        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();

        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();

        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);

        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);





        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
@@ -128,7 +124,7 @@ public class ApnPreferenceControllerTest { 




    @Test

    @Test

    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {

    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {

        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();

        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();

        final PersistableBundle bundle = new PersistableBundle();

        final PersistableBundle bundle = new PersistableBundle();

        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);

        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);

        bundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, true);

        bundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, true);