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

Merge "Fixed a crash with the headsUpManager" into qt-dev

Browse Source 
am: fcd42e9249

Change-Id: I82fedec3d4d6f297a022f42fe29e52bffbdc222a
This commit is contained in:
Selim Cinek
2019-07-19 17:39:24 -07:00
committed by android-build-merger
parent 6fa0743097 fcd42e9249
commit 1ebcfb66c9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java
View File

@@ -363,12 +363,15 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable,
} }
public Region calculateTouchableRegion() { public Region calculateTouchableRegion() {
if (!hasPinnedHeadsUp()) { NotificationEntry topEntry = getTopEntry();
// This call could be made in an inconsistent state while the pinnedMode hasn't been
// updated yet, but callbacks leading out of the headsUp manager, querying it. Let's
// therefore also check if the topEntry is null.
if (!hasPinnedHeadsUp() || topEntry == null) {
mTouchableRegion.set(0, 0, mStatusBarWindowView.getWidth(), mStatusBarHeight); mTouchableRegion.set(0, 0, mStatusBarWindowView.getWidth(), mStatusBarHeight);
updateRegionForNotch(mTouchableRegion); updateRegionForNotch(mTouchableRegion);
} else { } else {
NotificationEntry topEntry = getTopEntry();
if (topEntry.isChildInGroup()) { if (topEntry.isChildInGroup()) {
final NotificationEntry groupSummary = final NotificationEntry groupSummary =
mGroupManager.getGroupSummary(topEntry.notification); mGroupManager.getGroupSummary(topEntry.notification);