Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Caitlin Cassidy
2021-06-16 20:21:27 +00:00
committed by Android (Google) Code Review
parent 100b0929b7 2f583ee73a
commit ae8d7cff27
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2778,9 +2778,14 @@ public class StatusBar extends SystemUI implements DemoMode,
+ String.valueOf(CameraIntents.getOverrideCameraPackage(mContext))); + 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="); pw.print(" "); pw.print(var); pw.print(".BarTransitions.mMode=");
pw.println(BarTransitions.modeToString(transitions.getMode())); if (transitions != null) {
pw.println(BarTransitions.modeToString(transitions.getMode()));
} else {
pw.println("Unknown");
}
} }
public void createAndAddWindows(@Nullable RegisterStatusBarResult result) { public void createAndAddWindows(@Nullable RegisterStatusBarResult result) {

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

@@ -776,6 +776,12 @@ public class StatusBarTest extends SysuiTestCase {
mStatusBar.dump(null, new PrintWriter(new ByteArrayOutputStream()), null); mStatusBar.dump(null, new PrintWriter(new ByteArrayOutputStream()), null);
} }
@Test
public void testDumpBarTransitions_DoesNotCrash() {
StatusBar.dumpBarTransitions(
new PrintWriter(new ByteArrayOutputStream()), "var", /* transitions= */ null);
}
@Test @Test
@RunWithLooper(setAsMainLooper = true) @RunWithLooper(setAsMainLooper = true)
public void testUpdateKeyguardState_DoesNotCrash() { public void testUpdateKeyguardState_DoesNotCrash() {