Revert "Fix onUserInteraction not called with 3-button-nav and e..."
Revert submission 28167631-on-user-interaction
Reason for revert: Likely culprit for b/351986186 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:28167631-on-user-interaction
Change-Id: If79c90990817284adf36171fd515d836c6272483
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4cac85f..cda58e38 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -7511,6 +7511,7 @@
animationCallback.onBackCancelled();
} else {
topCallback.onBackInvoked();
+ return FINISH_HANDLED;
}
break;
}
@@ -7518,16 +7519,14 @@
if (keyEvent.getAction() == KeyEvent.ACTION_UP) {
if (!keyEvent.isCanceled()) {
topCallback.onBackInvoked();
+ return FINISH_HANDLED;
} else {
Log.d(mTag, "Skip onBackInvoked(), reason: keyEvent.isCanceled=true");
}
}
}
- if (keyEvent.getAction() == KeyEvent.ACTION_UP) {
- // forward a cancelled event so that following stages cancel their back logic
- keyEvent.cancel();
- }
- return FORWARD;
+
+ return FINISH_NOT_HANDLED;
}
@Override