From 1c3a9421a7c0cd0755fb20d2795f6211b8cff208 Mon Sep 17 00:00:00 2001
From: Behnam Heydarshahi <bhnm@google.com>
Date: Thu, 12 Jan 2023 15:40:31 +0000
Subject: [PATCH] Always index RingerModeAffected slices

When indexing slices, SliceDataConverter makes an exception for
RingerModeAffected slices. They can be !isAvailable() but still be
added to the list of slices.

Bug: 259084354

Test: Manual. Enable systemui DeviceConfig flag
volume_separate_notification. Open volume dialog.
Verify that ring & notification slice is split into ring slice and
notification slice.

Change-Id: Iaab30154025cd082b388c412da6ecd573b8d6fcf
---
 src/com/android/settings/slices/SliceDataConverter.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index eb08c5f978a..5177ff70505 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -52,6 +52,7 @@ import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceXmlParserUtils;
 import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.notification.RingerModeAffectedVolumePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.search.Indexable.SearchIndexProvider;
@@ -202,7 +203,10 @@ class SliceDataConverter {
                 final BasePreferenceController controller = SliceBuilderUtils
                         .getPreferenceController(mContext, controllerClassName, key);
                 // Only add pre-approved Slices available on the device.
-                if (!controller.isSliceable() || !controller.isAvailable()) {
+                // Always index RingerModeAffected slices so they are available for panel
+                if (!controller.isSliceable()
+                        || !(controller.isAvailable()
+                        || controller instanceof RingerModeAffectedVolumePreferenceController)) {
                     continue;
                 }
                 final String title = bundle.getString(METADATA_TITLE);