From e1db3206087b23ef99ea3252f741ce80149602a9 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Mon, 23 Jul 2018 15:24:59 -0700 Subject: [PATCH] Move InputWindow to shared JNI from services JNI. In preparation for passing the InputWindowInfo through SurfaceFlinger we will need to be able to access it from SurfaceControl which lives in the shared JNI. Thusly, we must also move the InputWindowInfo helpers there. This also tracks the move in frameworks/native of InputWindowHandle from libinput to libgui. Bug: 80101428 Bug: 113136004 Bug: 111440400 Change-Id: I16cd4c96c5f4e3f6d9e8d96cdaffc9e4b52d368e --- core/jni/Android.bp | 2 ++ .../jni/android_hardware_input_InputApplicationHandle.cpp | 2 +- .../jni/android_hardware_input_InputApplicationHandle.h | 4 +++- .../jni/android_hardware_input_InputWindowHandle.cpp | 4 ++-- .../jni/android_hardware_input_InputWindowHandle.h | 2 +- services/core/jni/Android.bp | 2 -- .../core/jni/com_android_server_input_InputManagerService.cpp | 4 ++-- 7 files changed, 11 insertions(+), 9 deletions(-) rename services/core/jni/com_android_server_input_InputApplicationHandle.cpp => core/jni/android_hardware_input_InputApplicationHandle.cpp (98%) rename services/core/jni/com_android_server_input_InputApplicationHandle.h => core/jni/android_hardware_input_InputApplicationHandle.h (96%) rename services/core/jni/com_android_server_input_InputWindowHandle.cpp => core/jni/android_hardware_input_InputWindowHandle.cpp (98%) rename services/core/jni/com_android_server_input_InputWindowHandle.h => core/jni/android_hardware_input_InputWindowHandle.h (97%) diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 762b43079c31c..8e24d10a206ff 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -209,6 +209,8 @@ cc_library_shared { "com_android_internal_view_animation_NativeInterpolatorFactoryHelper.cpp", "hwbinder/EphemeralStorage.cpp", "fd_utils.cpp", + "android_hardware_input_InputWindowHandle.cpp", + "android_hardware_input_InputApplicationHandle.cpp", ], include_dirs: [ diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.cpp b/core/jni/android_hardware_input_InputApplicationHandle.cpp similarity index 98% rename from services/core/jni/com_android_server_input_InputApplicationHandle.cpp rename to core/jni/android_hardware_input_InputApplicationHandle.cpp index 514b6e1c2f709..8ace8da77b2fe 100644 --- a/services/core/jni/com_android_server_input_InputApplicationHandle.cpp +++ b/core/jni/android_hardware_input_InputApplicationHandle.cpp @@ -21,7 +21,7 @@ #include #include -#include "com_android_server_input_InputApplicationHandle.h" +#include "android_hardware_input_InputApplicationHandle.h" namespace android { diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.h b/core/jni/android_hardware_input_InputApplicationHandle.h similarity index 96% rename from services/core/jni/com_android_server_input_InputApplicationHandle.h rename to core/jni/android_hardware_input_InputApplicationHandle.h index c9af711a7586a..711561150e518 100644 --- a/services/core/jni/com_android_server_input_InputApplicationHandle.h +++ b/core/jni/android_hardware_input_InputApplicationHandle.h @@ -17,7 +17,9 @@ #ifndef _ANDROID_SERVER_INPUT_APPLICATION_HANDLE_H #define _ANDROID_SERVER_INPUT_APPLICATION_HANDLE_H -#include +#include + +#include #include #include "jni.h" diff --git a/services/core/jni/com_android_server_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp similarity index 98% rename from services/core/jni/com_android_server_input_InputWindowHandle.cpp rename to core/jni/android_hardware_input_InputWindowHandle.cpp index c13aa38dc1330..f4829ad26aefc 100644 --- a/services/core/jni/com_android_server_input_InputWindowHandle.cpp +++ b/core/jni/android_hardware_input_InputWindowHandle.cpp @@ -25,8 +25,8 @@ #include #include -#include "com_android_server_input_InputWindowHandle.h" -#include "com_android_server_input_InputApplicationHandle.h" +#include "android_hardware_input_InputWindowHandle.h" +#include "android_hardware_input_InputApplicationHandle.h" namespace android { diff --git a/services/core/jni/com_android_server_input_InputWindowHandle.h b/core/jni/android_hardware_input_InputWindowHandle.h similarity index 97% rename from services/core/jni/com_android_server_input_InputWindowHandle.h rename to core/jni/android_hardware_input_InputWindowHandle.h index 44d4620c8b0c7..2be267e958ecd 100644 --- a/services/core/jni/com_android_server_input_InputWindowHandle.h +++ b/core/jni/android_hardware_input_InputWindowHandle.h @@ -17,7 +17,7 @@ #ifndef _ANDROID_SERVER_INPUT_WINDOW_HANDLE_H #define _ANDROID_SERVER_INPUT_WINDOW_HANDLE_H -#include +#include #include #include "jni.h" diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index becde7311607e..aca502d5dc969 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -29,9 +29,7 @@ cc_library_static { "com_android_server_devicepolicy_CryptoTestHelper.cpp", "com_android_server_HardwarePropertiesManagerService.cpp", "com_android_server_hdmi_HdmiCecController.cpp", - "com_android_server_input_InputApplicationHandle.cpp", "com_android_server_input_InputManagerService.cpp", - "com_android_server_input_InputWindowHandle.cpp", "com_android_server_lights_LightsService.cpp", "com_android_server_location_GnssLocationProvider.cpp", "com_android_server_locksettings_SyntheticPasswordManager.cpp", diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 42ade38fbe511..66103d9b73faf 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -60,8 +60,8 @@ #include #include "com_android_server_power_PowerManagerService.h" -#include "com_android_server_input_InputApplicationHandle.h" -#include "com_android_server_input_InputWindowHandle.h" +#include "android_hardware_input_InputApplicationHandle.h" +#include "android_hardware_input_InputWindowHandle.h" #include "android_hardware_display_DisplayViewport.h" #define INDENT " "