Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a crash with the top headsup entry

Browse Source 
Because of an optimization introduced, the topheads
up entry could be null, leading to a Nullpointer.

Change-Id: Ibba73d652b0b4aac15cc62e57d1dfcf88dc0a647
Fixes: 70386428
Test: manual expand while hun is visible
This commit is contained in:
Selim Cinek
2017-12-08 12:42:36 -08:00
parent cdf3bd037d
commit 61cfd4bcd8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
View File

@@ -448,7 +448,7 @@ public class StackScrollAlgorithm {
childState.height = Math.max(row.getIntrinsicHeight(), childState.height);
childState.hidden = false;
ExpandableViewState topState = resultState.getViewStateForView(topHeadsUpEntry);
if (!isTopEntry && (!mIsExpanded
if (topState != null && !isTopEntry && (!mIsExpanded
|| unmodifiedEndLocation < topState.yTranslation + topState.height)) {
// Ensure that a headsUp doesn't vertically extend further than the heads-up at
// the top most z-position