am 42bb545a: am 5c225b16: Even more native input dispatch work in progress.

Merge commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00'

* commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00':
  Even more native input dispatch work in progress.

1 files changed, 20 insertions, 10 deletions

diff --git a/services/jni/com_android_server_InputManager.cpp b/services/jni/com_android_server_InputManager.cpp
index a988a96..ab3922f 100644
--- a/services/jni/com_android_server_InputManager.cpp
+++ b/services/jni/com_android_server_InputManager.cpp
@@ -294,9 +294,7 @@ int32_t NativeInputManager::interceptKey(nsecs_t when,
 
     if (wmActions & WM_ACTION_PASS_TO_USER) {
         actions |= InputReaderPolicyInterface::ACTION_DISPATCH;
-    }
 
-    if (! (wmActions & WM_ACTION_PASS_TO_USER)) {
         if (down && isAppSwitchKey(keyCode)) {
             env->CallVoidMethod(mCallbacksObj, gCallbacksClassInfo.notifyAppSwitchComing);
             checkExceptionFromCallback(env, "notifyAppSwitchComing");
@@ -312,12 +310,18 @@ int32_t NativeInputManager::interceptTouch(nsecs_t when) {
     LOGD("interceptTouch - when=%lld", when);
 #endif
 
-    if (! isScreenOn()) {
-        // Touch events do not wake the device.
-        return InputReaderPolicyInterface::ACTION_NONE;
+    int32_t actions = InputReaderPolicyInterface::ACTION_NONE;
+    if (isScreenOn()) {
+        // Only dispatch touch events when the device is awake.
+        actions |= InputReaderPolicyInterface::ACTION_DISPATCH;
     }
 
-    return InputReaderPolicyInterface::ACTION_DISPATCH;
+    if (! isScreenBright()) {
+        // Brighten the screen if dimmed.
+        actions |= InputReaderPolicyInterface::ACTION_BRIGHT_HERE;
+    }
+
+    return actions;
 }
 
 int32_t NativeInputManager::interceptTrackball(nsecs_t when,
@@ -327,12 +331,18 @@ int32_t NativeInputManager::interceptTrackball(nsecs_t when,
             when, buttonChanged, buttonDown, rolled);
 #endif
 
-    if (! isScreenOn()) {
-        // Trackball motions and button presses do not wake the device.
-        return InputReaderPolicyInterface::ACTION_NONE;
+    int32_t actions = InputReaderPolicyInterface::ACTION_NONE;
+    if (isScreenOn()) {
+        // Only dispatch trackball events when the device is awake.
+        actions |= InputReaderPolicyInterface::ACTION_DISPATCH;
     }
 
-    return InputReaderPolicyInterface::ACTION_DISPATCH;
+    if (! isScreenBright()) {
+        // Brighten the screen if dimmed.
+        actions |= InputReaderPolicyInterface::ACTION_BRIGHT_HERE;
+    }
+
+    return actions;
 }
 
 int32_t NativeInputManager::interceptSwitch(nsecs_t when, int32_t switchCode,