diff options
| author | Winson Chung <winsonc@google.com> | 2014-12-04 00:07:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-04 00:07:57 +0000 |
| commit | ba1307b2b42b60893c88622f41f99efa2356350d (patch) | |
| tree | 61bd86c6327038e1259e7a268aec1ee3da7d6ac9 /packages/SystemUI/src/com/android/systemui | |
| parent | 3ea6824034ea8fbcd418af8e07606f60fd844e45 (diff) | |
| parent | b255e49fe4cab9cae912714a009860c5c1993b33 (diff) | |
| download | frameworks_base-ba1307b2b42b60893c88622f41f99efa2356350d.zip frameworks_base-ba1307b2b42b60893c88622f41f99efa2356350d.tar.gz frameworks_base-ba1307b2b42b60893c88622f41f99efa2356350d.tar.bz2 | |
Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev
* changes:
Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 2623db3..33a36f6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -530,11 +530,12 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal /** Resets the focused task. */ void resetFocusedTask() { - if ((mStack != null) && (0 <= mFocusedTaskIndex) && - (mFocusedTaskIndex < mStack.getTaskCount())) { + if ((0 <= mFocusedTaskIndex) && (mFocusedTaskIndex < mStack.getTaskCount())) { Task t = mStack.getTasks().get(mFocusedTaskIndex); TaskView tv = getChildViewForTask(t); - tv.unsetFocusedTask(); + if (tv != null) { + tv.unsetFocusedTask(); + } } mFocusedTaskIndex = -1; } |