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

Change-Id: Ibb0a7616784160bbf2be0242bf42cd1125411ab8
This commit is contained in:
Automerger Merge Worker
2020-03-12 03:15:53 +00:00

View File

@@ -33,11 +33,13 @@ import android.net.ConnectivityManager;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.FeatureFlagUtils;
import android.widget.TextView;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowWifiManager;
@@ -83,6 +85,7 @@ public class WifiTetherSettingsTest {
@Test
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
setupIsTetherAvailable(true);