diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2016-02-15 12:41:18 -0800 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2016-02-16 14:35:46 -0800 |
| commit | 2c897b2953a6450b9fa9597fc403ed3ec581549d (patch) | |
| tree | 753f1c5c40b28d30bb92236733e0d1183a2622f2 | |
| parent | 71f3c04bc335051cfb534fb50e79931cccc26e38 (diff) | |
| download | android_frameworks_base-2c897b2953a6450b9fa9597fc403ed3ec581549d.tar.gz android_frameworks_base-2c897b2953a6450b9fa9597fc403ed3ec581549d.tar.bz2 android_frameworks_base-2c897b2953a6450b9fa9597fc403ed3ec581549d.zip | |
SystemUI: Handle possible NPE on task.group during layout.
Change-Id: Idcc12617e139ab8911873284a02911c8ab47c768
TICKET: YAM-124
(cherry picked from commit e7f34ea6784fbbd0906efa4ff6c8cc89e870385e)
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java index 49b9129a032..61059043325 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java @@ -142,9 +142,11 @@ public class TaskStackViewLayoutAlgorithm { if (i < (taskCount - 1)) { // Increment the peek height - float pPeek = task.group.isFrontMostTask(task) ? - pBetweenAffiliateOffset : pWithinAffiliateOffset; - pAtFrontMostCardTop += pPeek; + if (task.group != null) { + float pPeek = task.group.isFrontMostTask(task) ? + pBetweenAffiliateOffset : pWithinAffiliateOffset; + pAtFrontMostCardTop += pPeek; + } } } |