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

Change-Id: I525165fad42c5a32e57d3a644c95ae691db2e0d8

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(

tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java

@@ -156,6 +156,12 @@ public class MediaOutputGroupSliceTest {
         assertThat(rows).isEqualTo(3);
     }
 
+    @Test
+    public void getSlice_nullWorker_noException() {
+        sMediaDeviceUpdateWorker = null;
+        mMediaOutputGroupSlice.getSlice();
+    }
+
     @Test
     public void getSlice_withOneSelectableDevice_checkTitle() {
         mSelectableDevices.add(mDevice1);