Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3296cc24 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 9fd93a41 087a06f4
Loading
Loading
Loading
Loading
+16 −11
Original line number Diff line number Diff line
@@ -561,18 +561,23 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
                            .setLeaveOpenOnKeyguardHide(true);
                }

                Optional<StatusBar> statusBarOptional = mStatusBarOptionalLazy.get();
                if (statusBarOptional.isPresent()) {
                    Runnable r = () -> mMainHandler.post(
                            () -> openGutsInternal(view, x, y, menuItem));

                mStatusBarOptionalLazy.get().ifPresent(
                        statusBar -> statusBar.executeRunnableDismissingKeyguard(
                    statusBarOptional.get().executeRunnableDismissingKeyguard(
                            r,
                            null /* cancelAction */,
                            false /* dismissShade */,
                            true /* afterKeyguardGone */,
                                true /* deferred */));
                            true /* deferred */);
                    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);
    }