Merge "Fix failure of ZenModeAutomaticRulesPreferenceControllerTest"

This commit is contained in:
Beverly Tai
2017-12-07 21:26:10 +00:00
committed by Android (Google) Code Review

View File

@@ -82,7 +82,7 @@ public class ZenModeAutomaticRulesPreferenceControllerTest {
mock(Lifecycle.class)); mock(Lifecycle.class));
ReflectionHelpers.setField(mController, "mBackend", mBackend); ReflectionHelpers.setField(mController, "mBackend", mBackend);
ReflectionHelpers.setField(mController, "DEFAULT_RULE_IDS", mDefaultIds); ReflectionHelpers.setField(mController, "mDefaultRuleIds", mDefaultIds);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
mockPref); mockPref);
@@ -188,4 +188,4 @@ public class ZenModeAutomaticRulesPreferenceControllerTest {
return ruleMap; return ruleMap;
} }
} }