diff options
| author | Winson Chung <winsonc@google.com> | 2015-03-23 22:16:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-23 22:16:38 +0000 |
| commit | f21ef3d25af14ffaa8c1122b6a504fdf7b82b60f (patch) | |
| tree | 0ef436b6c00ff6b45845f49f395858d9cd93b00c /packages/SystemUI | |
| parent | 386b397b0b8d2c15d9aad279f73be1cc4396bf7a (diff) | |
| parent | 98127fb818778b26127a1d52db8ef0ccff200470 (diff) | |
| download | frameworks_base-f21ef3d25af14ffaa8c1122b6a504fdf7b82b60f.zip frameworks_base-f21ef3d25af14ffaa8c1122b6a504fdf7b82b60f.tar.gz frameworks_base-f21ef3d25af14ffaa8c1122b6a504fdf7b82b60f.tar.bz2 | |
Merge "Adding null check for focused stack before trying to switch affiliated tasks."
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/Recents.java | 2 |
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 7f1e876..2d1fab0 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -385,7 +385,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) |