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

Merge "Fix to call openGutsInternal even when no Statusbar exists" into sc-v2-dev am: 3296cc24eb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15320516

Change-Id: I112c03b7a884030020917a7450b4a17cb1c262d3
This commit is contained in:
TreeHugger Robot
2021-07-20 00:03:23 +00:00
committed by Automerger Merge Worker
parent 37aec8764a 3296cc24eb
commit da095b8e19
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
View File

@@ -561,17 +561,22 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
.setLeaveOpenOnKeyguardHide(true); .setLeaveOpenOnKeyguardHide(true);
} }
Runnable r = () -> mMainHandler.post( Optional<StatusBar> statusBarOptional = mStatusBarOptionalLazy.get();
() -> openGutsInternal(view, x, y, menuItem)); if (statusBarOptional.isPresent()) {
Runnable r = () -> mMainHandler.post(
mStatusBarOptionalLazy.get().ifPresent( () -> openGutsInternal(view, x, y, menuItem));
statusBar -> statusBar.executeRunnableDismissingKeyguard( statusBarOptional.get().executeRunnableDismissingKeyguard(
r, r,
null /* cancelAction */, null /* cancelAction */,
false /* dismissShade */, false /* dismissShade */,
true /* afterKeyguardGone */, true /* afterKeyguardGone */,
true /* deferred */)); true /* deferred */);
return true; return true;
}
/**
* When {@link StatusBar} doesn't exist, falling through to call
* {@link #openGutsInternal(View,int,int,NotificationMenuRowPlugin.MenuItem)}.
*/
} }
} }
return openGutsInternal(view, x, y, menuItem); return openGutsInternal(view, x, y, menuItem);