PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d691374d9ff85d56e9032bab1ece092ca1c56a0
This commit is contained in:
TreeHugger Robot
2021-02-01 18:27:33 +00:00
committed by Automerger Merge Worker
parent 0942bf2582 953dc45f77
commit fbdfc8fcb0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/InternetPreferenceController.java
View File

@@ -62,7 +62,8 @@ public class InternetPreferenceController extends AbstractPreferenceController i
private InternetUpdater mInternetUpdater; private InternetUpdater mInternetUpdater;
private @InternetUpdater.InternetType int mInternetType; private @InternetUpdater.InternetType int mInternetType;
private static Map<Integer, Integer> sIconMap = new HashMap<>(); @VisibleForTesting
static Map<Integer, Integer> sIconMap = new HashMap<>();
static { static {
sIconMap.put(INTERNET_APM, R.drawable.ic_airplanemode_active); sIconMap.put(INTERNET_APM, R.drawable.ic_airplanemode_active);
sIconMap.put(INTERNET_APM_NETWORKS, R.drawable.ic_airplane_safe_networks_24dp); sIconMap.put(INTERNET_APM_NETWORKS, R.drawable.ic_airplane_safe_networks_24dp);

1
tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
View File

@@ -79,6 +79,7 @@ public class InternetPreferenceControllerTest {
when(wifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED); when(wifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
mController = new InternetPreferenceController(mContext, mock(Lifecycle.class)); mController = new InternetPreferenceController(mContext, mock(Lifecycle.class));
mController.sIconMap.put(INTERNET_WIFI, 0);
if (Looper.myLooper() == null) { if (Looper.myLooper() == null) {
Looper.prepare(); Looper.prepare();
} }