Merge "Fix occasional NPE" into pi-dev

2018-03-15 15:10:49 +00:00
parent f30b7ef753 4c46fd3167
commit d2f757bdd9
1 changed files with 3 additions and 0 deletions
--- 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;
        }