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

Merge "[Settings] Change the way in InternetPreferenceController for getting the subscription info from room db part4"

Browse Source
This commit is contained in:
Zoey Chen
2022-10-27 10:29:22 +00:00
committed by Android (Google) Code Review
parent 8fd8da3b5c 1c4a1989f3
commit 93b0b686bd
7 changed files with 62 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
@@ -73,6 +74,7 @@ public class InternetPreferenceControllerTest {
private InternetPreferenceController mController;
private PreferenceScreen mScreen;
private Preference mPreference;
private LifecycleOwner mLifecycleOwner;
@Before
public void setUp() {
@@ -84,7 +86,8 @@ public class InternetPreferenceControllerTest {
when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
when(wifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
mController = new InternetPreferenceController(mContext, mock(Lifecycle.class));
mController = new InternetPreferenceController(mContext, mock(Lifecycle.class),
mLifecycleOwner);
mController.sIconMap.put(INTERNET_WIFI, 0);
if (Looper.myLooper() == null) {
Looper.prepare();

4
tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
View File

@@ -170,8 +170,8 @@ public class NetworkProviderCallsSmsControllerTest {
TelephonyManager.DEFAULT_PORT_INDEX, false, null,
SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false,
"1234567890", true, "default", false, isValid,
true, isActive, isAvailable, isDefaultCall,
isDefaultSms, false, false);
true, isActive, isAvailable, isDefaultCall, isDefaultSms, false, false,
false);
}
@Test

2
tests/unit/src/com/android/settings/network/NetworkProviderDownloadedSimListControllerTest.java
View File

@@ -150,7 +150,7 @@ public class NetworkProviderDownloadedSimListControllerTest {
mcc, mnc, countryIso, true, cardId, TelephonyManager.DEFAULT_PORT_INDEX, false,
null, SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false,
"1234567890", true, defaultSimConfig.toString(), false, isValid, true, isActive,
isAvailable, isDefaultCall, isDefaultSms, isDefaultData, false);
isAvailable, isDefaultCall, isDefaultSms, isDefaultData, false, false);
}
private String setSummaryResId(String resName) {

3
tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
View File

@@ -156,8 +156,7 @@ public class NetworkProviderSimListControllerTest {
mcc, mnc, countryIso, false, cardId, TelephonyManager.DEFAULT_PORT_INDEX, false,
null, SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false,
"1234567890", true, defaultSimConfig.toString(), false, isValid, true, isActive,
isAvailable,
isDefaultCall, isDefaultSms, false, false);
isAvailable, isDefaultCall, isDefaultSms, false, false, false);
}
private String setSummaryResId(String resName, String value) {