Remove Wi-Fi hotspot from settings search for non-admin users
- Don't use ViewModel if the settings UI is restricted Bug: 284931681 Test: manual test atest -c WifiTetherSettingsTest Change-Id: I3ae23b01b3be821c3560552b39cbd83ab51b2095
This commit is contained in:
@@ -146,6 +146,7 @@ public class WifiTetherSettingsTest {
|
||||
doReturn(mTetheringManager).when(mContext).getSystemService(Context.TETHERING_SERVICE);
|
||||
doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs();
|
||||
doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
|
||||
doReturn(true).when(mUserManager).isAdminUser();
|
||||
when(mWifiRestriction.isTetherAvailable(mContext)).thenReturn(true);
|
||||
when(mWifiRestriction.isHotspotAvailable(mContext)).thenReturn(true);
|
||||
|
||||
@@ -184,10 +185,22 @@ public class WifiTetherSettingsTest {
|
||||
verify(mSettings).finish();
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(shadows = ShadowRestrictedDashboardFragment.class)
|
||||
public void onCreate_uiIsRestricted_shouldNotGetViewModel() {
|
||||
mSettings.mWifiTetherViewModel = null;
|
||||
when(mWifiRestriction.isHotspotAvailable(mContext)).thenReturn(false);
|
||||
|
||||
mSettings.onCreate(null);
|
||||
|
||||
assertThat(mSettings.mWifiTetherViewModel).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(shadows = ShadowFragment.class)
|
||||
public void onStart_uiIsRestricted_removeAllPreferences() {
|
||||
spyWifiTetherSettings();
|
||||
mSettings.mUnavailable = true;
|
||||
|
||||
mSettings.onStart();
|
||||
|
||||
@@ -306,13 +319,21 @@ public class WifiTetherSettingsTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isPageSearchEnabled_canShowWifiHotspot_returnTrue() {
|
||||
public void isPageSearchEnabled_allReady_returnTrue() {
|
||||
setCanShowWifiHotspotCached(true);
|
||||
|
||||
assertThat(WifiTetherSettings.SEARCH_INDEX_DATA_PROVIDER.isPageSearchEnabled(mContext))
|
||||
.isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isPageSearchEnabled_isNotAdminUser_returnFalse() {
|
||||
doReturn(false).when(mUserManager).isAdminUser();
|
||||
|
||||
assertThat(WifiTetherSettings.SEARCH_INDEX_DATA_PROVIDER.isPageSearchEnabled(mContext))
|
||||
.isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isPageSearchEnabled_canNotShowWifiHotspot_returnFalse() {
|
||||
setCanShowWifiHotspotCached(false);
|
||||
@@ -419,5 +440,10 @@ public class WifiTetherSettingsTest {
|
||||
public void onCreate(Bundle icicle) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Implementation
|
||||
public boolean isUiRestricted() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user