Merge "Fix robotests fail if turning on silky home by default" into sc-dev

This commit is contained in:
Yi-Ling Chuang
2021-02-03 01:14:24 +00:00
committed by Android (Google) Code Review
17 changed files with 32 additions and 72 deletions

View File

@@ -36,7 +36,6 @@ import android.util.FeatureFlagUtils;
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -66,13 +65,7 @@ public class TopLevelDisplayPreferenceControllerTest {
when(mContext.getString(R.string.config_wallpaper_picker_class)).thenReturn("cls");
mController = new TopLevelDisplayPreferenceController(mContext, "test_key");
}
@After
public void tearDown() {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test