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

Merge "Fix WifiTetherSettingsTest" into rvc-dev am: a7bd169814

Browse Source 
Change-Id: If84bded0c61524cda613f57ff0b7839817655eae
This commit is contained in:
Automerger Merge Worker
2020-03-12 03:04:00 +00:00
parent 61eb0791a3 a7bd169814
commit 93fedb0e3f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
View File

@@ -33,11 +33,13 @@ import android.net.ConnectivityManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.FeatureFlagUtils;
import android.widget.TextView; import android.widget.TextView;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFragment; import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowWifiManager; import com.android.settings.testutils.shadow.ShadowWifiManager;
@@ -83,6 +85,7 @@ public class WifiTetherSettingsTest {
@Test @Test
public void wifiTetherNonIndexableKeys_tetherAvailable_keysNotReturned() { public void wifiTetherNonIndexableKeys_tetherAvailable_keysNotReturned() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
// To let TetherUtil.isTetherAvailable return true, select one of the combinations // To let TetherUtil.isTetherAvailable return true, select one of the combinations
setupIsTetherAvailable(true); setupIsTetherAvailable(true);