commit 2e16d78872975f931b34a16408ed208abe7231f0
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 27 08:35:48 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 27 08:35:48 2020 +0000
tree 45ad8d0e54ad4fdf056a0fe48b774f4040297196
parent 1b5f34789351b1e220e97f6b5d665ba0c6e8ba98
parent c433a867b3489cf9819a983ee01a3e8e829d94ba

Merge "Dynamic grouping failed the first time" into rvc-dev

src/com/android/settings/media/MediaOutputGroupSlice.java

diff --git a/src/com/android/settings/media/MediaOutputGroupSlice.java b/src/com/android/settings/media/MediaOutputGroupSlice.java
index 7730b2d..be6c298 100644
--- a/src/com/android/settings/media/MediaOutputGroupSlice.java
+++ b/src/com/android/settings/media/MediaOutputGroupSlice.java
@@ -83,6 +83,9 @@
         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

diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java
index 4fbcb2d..12e066b 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java
@@ -157,6 +157,12 @@
     }
 
     @Test
+    public void getSlice_nullWorker_noException() {
+        sMediaDeviceUpdateWorker = null;
+        mMediaOutputGroupSlice.getSlice();
+    }
+
+    @Test
     public void getSlice_withOneSelectableDevice_checkTitle() {
         mSelectableDevices.add(mDevice1);
         mSelectedDevices.add(mDevice1);