commit 555f75d0796be0bac738ed592cf19467bfe9a446
author James O'Leary <jamesoleary@google.com> Mon May 20 23:21:54 2019 -0400
committer android-build-team Robot <android-build-team-robot@google.com> Tue May 21 22:46:07 2019 +0000
tree 94c3032fd4c1299395fb4d4e70ed62778b157896
parent 89907cdd37b02468e5e12d2203dc6cf5123e98c7

Fix NPE with live wallpaper

Test: Verify WAI
Fixes: 133130262, 133194773, 133168135, 133160573
Change-Id: Ib38947326839a5c4806b909ead2484efd5a535a1
(cherry picked from commit 35cb43b811206def4929128911d658ed415673b3)

packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java

diff --git a/packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java b/packages/SystemUI/src/com/android/systemui/assist/PhoneStateMonitor.java
index 8c07083..ea08c33 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 @@
     }
 
     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() {