diff --git a/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java index 9332c9b0c2b..82f0816fc86 100644 --- a/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceController.java @@ -76,7 +76,7 @@ public class ZenModeBehaviorFooterPreferenceController extends AbstractZenModePr // DND turned on by an automatic rule with deprecated zen mode for (ZenModeConfig.ZenRule automaticRule : config.automaticRules.values()) { - if (automaticRule.isAutomaticActive() && isDeprecatedZenMode( + if (automaticRule.isActive() && isDeprecatedZenMode( automaticRule.zenMode)) { ComponentName component = automaticRule.component; if (component != null) { diff --git a/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java index 6a574411a25..4781b360419 100644 --- a/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceController.java @@ -153,7 +153,7 @@ public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePr // DND turned on by an automatic rule for (ZenModeConfig.ZenRule automaticRule : config.automaticRules.values()) { - if (automaticRule.isAutomaticActive()) { + if (automaticRule.isActive()) { // set footer if 3rd party rule if (!mZenModeConfigWrapper.isTimeRule(automaticRule.conditionId)) { return mContext.getString(R.string.zen_mode_settings_dnd_automatic_rule, @@ -180,7 +180,7 @@ public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePr } for (ZenModeConfig.ZenRule automaticRule : config.automaticRules.values()) { - if (automaticRule.isAutomaticActive()) { + if (automaticRule.isActive()) { zenRules.add(automaticRule); } } diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java index fd795155a4f..2b0d6e7687d 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -43,7 +43,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.notification.zen.AbstractZenModePreferenceController.ZenModeConfigWrapper; -import com.android.settings.notification.zen.ZenModeBehaviorFooterPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -206,7 +205,7 @@ public class ZenModeBehaviorFooterPreferenceControllerTest { ZenRule injectedRule = spy(new ZenRule()); injectedRule.zenMode = ZEN_MODE_ALARMS; injectedRule.component = mock(ComponentName.class); - when(injectedRule.isAutomaticActive()).thenReturn(true); + when(injectedRule.isActive()).thenReturn(true); when(injectedRule.component.getPackageName()).thenReturn(TEST_APP_NAME); injectedAutomaticRules.put("testid", injectedRule); @@ -226,7 +225,7 @@ public class ZenModeBehaviorFooterPreferenceControllerTest { ZenRule injectedRule = spy(new ZenRule()); injectedRule.zenMode = ZEN_MODE_NO_INTERRUPTIONS; injectedRule.component = mock(ComponentName.class); - when(injectedRule.isAutomaticActive()).thenReturn(true); + when(injectedRule.isActive()).thenReturn(true); when(injectedRule.component.getPackageName()).thenReturn(TEST_APP_NAME); injectedAutomaticRules.put("testid", injectedRule); diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java index efa2f558b5f..e5c2d426cae 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeSettingsFooterPreferenceControllerTest.java @@ -44,7 +44,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.notification.zen.AbstractZenModePreferenceController.ZenModeConfigWrapper; -import com.android.settings.notification.zen.ZenModeSettingsFooterPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -289,7 +288,7 @@ public class ZenModeSettingsFooterPreferenceControllerTest { injectedRule.component = mock(ComponentName.class); injectedRule.name = nameAndId; injectedRule.conditionId = new Uri.Builder().authority(nameAndId).build(); // unique uri - when(injectedRule.isAutomaticActive()).thenReturn(isActive); + when(injectedRule.isActive()).thenReturn(isActive); when(mConfigWrapper.isTimeRule(injectedRule.conditionId)).thenReturn(!isApp); if (isApp) { when(injectedRule.component.getPackageName()).thenReturn(TEST_APP_NAME);