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

Commit 953dc45f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue."... 

Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev am: b40e5dc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64e4d969380bb87315347a1ee5812039474da0c1
parents fdd83313 b40e5dc8

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

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ public class InternetPreferenceController extends AbstractPreferenceController i 
    private InternetUpdater mInternetUpdater;

    private @InternetUpdater.InternetType int mInternetType;



    private static Map<Integer, Integer> sIconMap = new HashMap<>();

    @VisibleForTesting

    static Map<Integer, Integer> sIconMap = new HashMap<>();

    static {

        sIconMap.put(INTERNET_APM, R.drawable.ic_airplanemode_active);

        sIconMap.put(INTERNET_APM_NETWORKS, R.drawable.ic_airplane_safe_networks_24dp);

tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ public class InternetPreferenceControllerTest { 
        when(wifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);



        mController = new InternetPreferenceController(mContext, mock(Lifecycle.class));

        mController.sIconMap.put(INTERNET_WIFI, 0);

        if (Looper.myLooper() == null) {

            Looper.prepare();

        }