From 35cb43b811206def4929128911d658ed415673b3 Mon Sep 17 00:00:00 2001 From: James O'Leary Date: Mon, 20 May 2019 23:21:54 -0400 Subject: [PATCH] Fix NPE with live wallpaper Test: Verify WAI Fixes: 133130262, 133194773, 133168135, 133160573 Change-Id: Ib38947326839a5c4806b909ead2484efd5a535a1 --- .../src/com/android/systemui/assist/PhoneStateMonitor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java b/packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java index 8c070835f69ed..ea08c335b31d4 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java +++ b/packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java @@ -136,7 +136,11 @@ final class PhoneStateMonitor { } private boolean isLauncherShowing(ActivityManager.RunningTaskInfo runningTaskInfo) { - return runningTaskInfo.topActivity.equals(mDefaultHome); + if (runningTaskInfo == null) { + return false; + } else { + return runningTaskInfo.topActivity.equals(mDefaultHome); + } } private boolean isAppImmersive() {