commit 4c46fd3167cce7f9fbc2af7a624ba97f17952cac
author Julia Reynolds <juliacr@google.com> Wed Mar 14 13:48:39 2018 -0400
committer Julia Reynolds <juliacr@google.com> Thu Mar 15 08:37:58 2018 -0400
tree 030f156a3fcc903d38f4ea9abb04674b74eb4e63
parent d4b6c8c16204ccd0b0e6d452b1831f7a965fbccd

Fix occasional NPE

Change-Id: Ia815d2160b1860b2f10a5d30019d03d1ee777fe8
Fixes: 73558046
Test: none

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 91314fe..e94d6bd 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -897,6 +897,9 @@
     }
 
     private String getStreamLabelH(StreamState ss) {
+        if (ss == null) {
+            return "";
+        }
         if (ss.remoteLabel != null) {
             return ss.remoteLabel;
         }