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

This commit is contained in:
TreeHugger Robot
2021-07-19 23:49:57 +00:00
committed by Android (Google) Code Review

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);