Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e534411 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Fix occasional NPE" into pi-dev 

am: d2f757bd

Change-Id: Ib0ecd63c2752cbe7fe2464ea98268dda462d864b
parents 7eabbd5a d2f757bd

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

+3 −0
Original line number Diff line number Diff line
@@ -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;

        }