diff --git a/src/com/android/settings/media/MediaOutputGroupSlice.java b/src/com/android/settings/media/MediaOutputGroupSlice.java index 7730b2d88e6..be6c2984867 100644 --- 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( diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java index 4fbcb2d4df1..12e066bb485 100644 --- a/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java +++ b/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);