diff --git a/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java index 966461055f2..89af2615d63 100644 --- a/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceController.java @@ -118,7 +118,10 @@ public class ZenModeAddBypassingAppsPreferenceController extends AbstractPrefere return; } - ApplicationsState.AppFilter filter = ApplicationsState.FILTER_ALL_ENABLED; + ApplicationsState.AppFilter filter = android.multiuser.Flags.enablePrivateSpaceFeatures() + && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace() + ? ApplicationsState.FILTER_ENABLED_NOT_QUIET + : ApplicationsState.FILTER_ALL_ENABLED; mAppSession.rebuild(filter, ApplicationsState.ALPHA_COMPARATOR); } diff --git a/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java index f4b7036c3d0..2ae7d433a7b 100644 --- a/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeAllBypassingAppsPreferenceController.java @@ -45,7 +45,6 @@ import com.android.settingslib.widget.AppPreference; import java.util.ArrayList; import java.util.List; - /** * Adds a preference to the PreferenceScreen for each notification channel that can bypass DND. */ @@ -107,7 +106,10 @@ public class ZenModeAllBypassingAppsPreferenceController extends AbstractPrefere return; } - ApplicationsState.AppFilter filter = ApplicationsState.FILTER_ALL_ENABLED; + ApplicationsState.AppFilter filter = android.multiuser.Flags.enablePrivateSpaceFeatures() + && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace() + ? ApplicationsState.FILTER_ENABLED_NOT_QUIET + : ApplicationsState.FILTER_ALL_ENABLED; mAppSession.rebuild(filter, ApplicationsState.ALPHA_COMPARATOR); } diff --git a/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java index 8d2ae4838fd..e16124a2fe6 100644 --- a/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java +++ b/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java @@ -82,7 +82,10 @@ public class ZenModeBypassingAppsPreferenceController extends AbstractZenModePre return; } - ApplicationsState.AppFilter filter = ApplicationsState.FILTER_ALL_ENABLED; + ApplicationsState.AppFilter filter = android.multiuser.Flags.enablePrivateSpaceFeatures() + && android.multiuser.Flags.handleInterleavedSettingsForPrivateSpace() + ? ApplicationsState.FILTER_ENABLED_NOT_QUIET + : ApplicationsState.FILTER_ALL_ENABLED; List apps = mAppSession.rebuild(filter, ApplicationsState.ALPHA_COMPARATOR); updateAppsBypassingDndSummaryText(apps); diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceControllerTest.java index 2569ca3592f..27df89046f4 100644 --- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeAddBypassingAppsPreferenceControllerTest.java @@ -162,4 +162,7 @@ public class ZenModeAddBypassingAppsPreferenceControllerTest { assertThat(pref.getKey()).isEqualTo( ZenModeAddBypassingAppsPreferenceController.KEY_NO_APPS); } + + // TODO(b/331624810): Add tests to verify updateAppList() when the filter is + // ApplicationsState.FILTER_ENABLED_NOT_QUIET }