Snap for 7944517 from 85fe04680fa7ac899058c09d02e8625381231e65 to sc-v2-release
Change-Id: I45e0d4f86054c9ad4a3327a662b4e3ded3b30494
diff --git a/src/com/android/car/rotary/RotaryService.java b/src/com/android/car/rotary/RotaryService.java
index 7fc28f7..48ab21c 100644
--- a/src/com/android/car/rotary/RotaryService.java
+++ b/src/com/android/car/rotary/RotaryService.java
@@ -1116,11 +1116,8 @@
}
return true;
case KeyEvent.KEYCODE_BACK:
- if (mInDirectManipulationMode) {
- handleBackButtonEvent(action);
- return true;
- }
- return false;
+ handleBackButtonEvent(action);
+ return true;
default:
// Do nothing
}
@@ -1912,9 +1909,10 @@
if (!isValidAction(action)) {
return;
}
- // If the focused node doesn't support rotate directly, inject Back button event, then the
- // application will handle the injected event.
- if (!DirectManipulationHelper.supportRotateDirectly(mFocusedNode)) {
+ // If we're not in direct manipulation mode or the focused node doesn't support rotate
+ // directly, inject Back button event; then the application will handle the injected event.
+ if (!mInDirectManipulationMode
+ || !DirectManipulationHelper.supportRotateDirectly(mFocusedNode)) {
injectKeyEvent(KeyEvent.KEYCODE_BACK, action);
return;
}