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

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

Merge "Fix occasional NPE" into pi-dev am: d2f757bd

am: 2e534411

Change-Id: Ibe50776d1b5658893a03288fcac1e1447d0ad4b7
parents 3d425eaa 2e534411
Loading
Loading
Loading
Loading
+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;
        }