commit 7897bb89a90dc630c29eeaa4cbf9e1a75ac1a1cc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 21 18:52:21 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 21 18:52:24 2017 +0000
tree d56f5ecdc9e090eb5ac4d27fd4c56c252a8e5462
parent e8c7b23a520330d3e0df8211a802296342661be7
parent 96b7a51de845d7c4f39a1e85669e860f6b6bf3c6

Merge "Fixing NPE when there is no running activity."

packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
index 8de4e58..33ad7fb 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
@@ -375,6 +375,10 @@
         MutableBoolean isHomeStackVisible = new MutableBoolean(true);
         if (!ssp.isRecentsActivityVisible(isHomeStackVisible)) {
             ActivityManager.RunningTaskInfo runningTask = ssp.getRunningTask();
+            if (runningTask == null) {
+                return;
+            }
+
             RecentsTaskLoader loader = Recents.getTaskLoader();
             sInstanceLoadPlan = loader.createLoadPlan(mContext);
             sInstanceLoadPlan.preloadRawTasks(!isHomeStackVisible.value);