From 96b7a51de845d7c4f39a1e85669e860f6b6bf3c6 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 8 Feb 2017 12:20:00 -0800 Subject: [PATCH] Fixing NPE when there is no running activity. Bug: 30668904 Test: Boot the device, kill launcher Change-Id: I10236d33c7fbc1d20b5d4b097e0660596188eaf0 --- .../src/com/android/systemui/recents/RecentsImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index 55491b24e20d6..0650d6464195d 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -374,6 +374,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener 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);