diff options
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 707fa603c2e3..07cbaa9c905f 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -7532,6 +7532,7 @@ public final class ViewRootImpl implements ViewParent, animationCallback.onBackCancelled(); } else { topCallback.onBackInvoked(); + return FINISH_HANDLED; } break; } @@ -7539,16 +7540,14 @@ public final class ViewRootImpl implements ViewParent, 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 |