summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robin Lee <rgl@google.com> 2024-05-27 12:35:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-27 12:35:04 +0000
commite84cbcfe1ba536a3a550fa190dc31600b1e5d86f (patch)
tree072bf5a61f859afee2372b1d6a0e419b718dfac4
parentfb52b4850ccebc26ff8db1056ff38ab1533a9fd4 (diff)
parentaae315ef8a09ca68c4587b4f735051343e491d89 (diff)
Merge "Use originalView's context" into main am: aae315ef8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2518956 Change-Id: Iaec9221bf3db131ac4b542f7e058af6a6b0ce4aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/com/android/internal/policy/DecorView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index 85662634c22d..e08443b00866 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -861,7 +861,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());
}