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

Commit e033ae9a authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Use originalView's context" into main am: aae315ef am: e84cbcfe 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2518956



Change-Id: I77d3464a1023762b4fe53f1730e3a2dc4a779c9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ae94d32 e84cbcfe

core/java/com/android/internal/policy/DecorView.java

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        final MenuHelper helper;

        final boolean isPopup = !Float.isNaN(x) && !Float.isNaN(y);

        if (isPopup) {

            helper = mWindow.mContextMenu.showPopup(getContext(), originalView, x, y);

            helper = mWindow.mContextMenu.showPopup(originalView.getContext(), originalView, x, y);

        } else {

            helper = mWindow.mContextMenu.showDialog(originalView, originalView.getWindowToken());

        }