Merge "Fix fail of AutomaticStorageManagerSwitchBarControllerTest"
This commit is contained in:
@@ -38,7 +38,6 @@ import com.android.settings.widget.SettingsMainSwitchBar;
|
|||||||
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.Answers;
|
import org.mockito.Answers;
|
||||||
@@ -138,13 +137,13 @@ public class AutomaticStorageManagerSwitchBarControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void initializingSwitchDoesNotTriggerView() {
|
public void initializingSwitchDoesNotTriggerView() {
|
||||||
Settings.Secure.putInt(
|
Settings.Secure.putInt(
|
||||||
mContext.getContentResolver(),
|
mContext.getContentResolver(),
|
||||||
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
|
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
|
||||||
1);
|
1);
|
||||||
|
|
||||||
|
mSwitchBar = new SettingsMainSwitchBar(mContext);
|
||||||
mController =
|
mController =
|
||||||
new AutomaticStorageManagerSwitchBarController(
|
new AutomaticStorageManagerSwitchBarController(
|
||||||
mContext,
|
mContext,
|
||||||
|
Reference in New Issue
Block a user