From 65c294036bd3a01af0755519d37ef7e9f64b9fb9 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 27 May 2015 12:45:20 -0700 Subject: [PATCH] Adding NPE check when the system has no tasks. Bug: 20640135 Change-Id: Ifb62d18dbf2125bc33325b7c2f2a44da51309325 --- .../com/android/systemui/recents/misc/SystemServicesProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java index e3fb16afe4591..ca0f357ff46ce 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java @@ -227,7 +227,7 @@ public class SystemServicesProxy { /** Returns the top task. */ public ActivityManager.RunningTaskInfo getTopMostTask() { List tasks = getRunningTasks(1); - if (!tasks.isEmpty()) { + if (tasks != null && !tasks.isEmpty()) { return tasks.get(0); } return null;