From 3ad6390b26c40c0cc0d47e244990a8ca585bcd13 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Mon, 29 Jun 2020 16:56:30 -0700 Subject: [PATCH] Send valid displayId and eventTime for edge back event Display ID is set to invalid and downtime is same as event time for ACTION_UP in gesture nav. Use default displayId if bubbles displayId is invalid. Bug: 156718868 Change-Id: Ia20b749816323d53a6f5901ab475d35e02013324 --- .../systemui/statusbar/phone/EdgeBackGestureHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java index 304fe0090e779..539158c40d456 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java @@ -614,8 +614,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa // Bubble controller will give us a valid display id if it should get the back event BubbleController bubbleController = Dependency.get(BubbleController.class); int bubbleDisplayId = bubbleController.getExpandedDisplayId(mContext); - if (code == KeyEvent.KEYCODE_BACK && bubbleDisplayId != INVALID_DISPLAY) { + if (bubbleDisplayId != INVALID_DISPLAY) { ev.setDisplayId(bubbleDisplayId); + } else { + ev.setDisplayId(mContext.getDisplay().getDisplayId()); } InputManager.getInstance().injectInputEvent(ev, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC); }