summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-03-23 15:12:53 -0700
committerWinson Chung <winsonc@google.com>2015-03-23 15:12:53 -0700
commit98127fb818778b26127a1d52db8ef0ccff200470 (patch)
tree19e7bc608ba96460d06ee5c01d17ebeb0f638388 /packages/SystemUI
parent8d09a7445ef2b396e443515ce4b02a52115778db (diff)
downloadframeworks_base-98127fb818778b26127a1d52db8ef0ccff200470.zip
frameworks_base-98127fb818778b26127a1d52db8ef0ccff200470.tar.gz
frameworks_base-98127fb818778b26127a1d52db8ef0ccff200470.tar.bz2
Adding null check for focused stack before trying to switch affiliated tasks.
Bug: 19870065 Change-Id: I674914b9d4a63cb9c73fa71bbc4b82c210e2001f
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/Recents.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
index 9dd82fc..a510b6f 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java
@@ -377,7 +377,7 @@ public class Recents extends SystemUI
}
// Return early if there are no tasks in the focused stack
- if (focusedStack.getTaskCount() == 0) return;
+ if (focusedStack == null || focusedStack.getTaskCount() == 0) return;
ActivityManager.RunningTaskInfo runningTask = mSystemServicesProxy.getTopMostTask();
// Return early if there is no running task (can't determine affiliated tasks in this case)