Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872

Change-Id: I193214a4dd54c751ea6bee005a4b6b847cf171d7
2020-04-27 08:38:38 +00:00
parent 5450d488b4 2e16d78872
commit 03f59415ce
2 changed files with 9 additions and 0 deletions
--- a/src/com/android/settings/media/MediaOutputGroupSlice.java
+++ b/src/com/android/settings/media/MediaOutputGroupSlice.java
@@ -83,6 +83,9 @@ public class MediaOutputGroupSlice implements CustomSliceable {
        final IconCompat titleIcon = IconCompat.createWithResource(mContext,
                R.drawable.ic_speaker_group_black_24dp);
        final Bitmap emptyBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+        if (getWorker() == null) {
+            return listBuilder.build();
+        }
        final int maxVolume = getWorker().getSessionVolumeMax();
        final String title = mContext.getString(R.string.media_output_group);
        final SliceAction primaryAction = SliceAction.createDeeplink(