Merge "Fix NPE with live wallpaper" into qt-dev am: c9fa07161a

am: a55ddc8084 Change-Id: I56824b12eb36b8292a7d8c91eea6a5087106c2e9
2019-05-21 11:40:17 -07:00
parent e2c7fd3af9 a55ddc8084
commit 5ad572e157
1 changed files with 5 additions and 1 deletions
--- 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() {