Merge "Fix NPE with live wallpaper" into qt-dev

2019-05-21 10:17:40 +00:00
parent c2490f8b7c 35cb43b811
commit c9fa07161a
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() {