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

Commit 323873e7 authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Automerger Merge Worker
Browse files

Merge "[Status Bar] Fix NPE in #dumpBarTransitions." into sc-dev am: ae8d7cff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14997041

Change-Id: I1030f51d5823c377984cf077b2d1fbaa6ebfa472
parents 52db881d ae8d7cff

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+7 −2
Original line number Diff line number Diff line
@@ -2778,9 +2778,14 @@ public class StatusBar extends SystemUI implements DemoMode, 
                + String.valueOf(CameraIntents.getOverrideCameraPackage(mContext)));

    }



    public static void dumpBarTransitions(PrintWriter pw, String var, BarTransitions transitions) {

    public static void dumpBarTransitions(

            PrintWriter pw, String var, @Nullable BarTransitions transitions) {

        pw.print("  "); pw.print(var); pw.print(".BarTransitions.mMode=");

        if (transitions != null) {

            pw.println(BarTransitions.modeToString(transitions.getMode()));

        } else {

            pw.println("Unknown");

        }

    }



    public void createAndAddWindows(@Nullable RegisterStatusBarResult result) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

+6 −0
Original line number Diff line number Diff line
@@ -776,6 +776,12 @@ public class StatusBarTest extends SysuiTestCase { 
        mStatusBar.dump(null, new PrintWriter(new ByteArrayOutputStream()), null);

    }



    @Test

    public void testDumpBarTransitions_DoesNotCrash() {

        StatusBar.dumpBarTransitions(

                new PrintWriter(new ByteArrayOutputStream()), "var", /* transitions= */ null);

    }



    @Test

    @RunWithLooper(setAsMainLooper = true)

    public void testUpdateKeyguardState_DoesNotCrash() {