Merge "Fix WifiTetherSettingsTest failed" into sc-dev am: ec31a6884c

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

Change-Id: I2376c09cd8d970cf93030a30e905aecfdb86a939
This commit is contained in:
Weng Su
2021-03-30 03:25:58 +00:00
committed by Automerger Merge Worker

View File

@@ -83,7 +83,7 @@ public class WifiTetherSettingsTest {
.when(mContext).getSystemService(ConnectivityManager.class);
doReturn(mTetheringManager).when(mContext).getSystemService(TetheringManager.class);
doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs();
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
mWifiTetherSettings = new WifiTetherSettings();
}
@@ -133,7 +133,7 @@ public class WifiTetherSettingsTest {
when(settings.getContext()).thenReturn(mContext);
final Resources.Theme theme = mContext.getTheme();
when(activity.getTheme()).thenReturn(theme);
when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager);
when(activity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
doNothing().when(settings)
.onCreatePreferences(any(Bundle.class), nullable(String.class));
final FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();