From 4c46fd3167cce7f9fbc2af7a624ba97f17952cac Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 14 Mar 2018 13:48:39 -0400
Subject: [PATCH] Fix occasional NPE

Change-Id: Ia815d2160b1860b2f10a5d30019d03d1ee777fe8
Fixes: 73558046
Test: none
---
 .../src/com/android/systemui/volume/VolumeDialogImpl.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 91314fe381181..e94d6bd5ee99f 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 @@ public class VolumeDialogImpl implements VolumeDialog {
     }
 
     private String getStreamLabelH(StreamState ss) {
+        if (ss == null) {
+            return "";
+        }
         if (ss.remoteLabel != null) {
             return ss.remoteLabel;
         }