Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move InputWindow to shared JNI from services JNI.

Browse Source 
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
This commit is contained in:
Robert Carr
2018-07-23 15:24:59 -07:00
committed by Rob Carr
parent e224120377
commit e1db320608
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/Android.bp
View File

@@ -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: [

2
services/core/jni/com_android_server_input_InputApplicationHandle.cpp → core/jni/android_hardware_input_InputApplicationHandle.cpp
View File

@@ -21,7 +21,7 @@
#include <android_runtime/AndroidRuntime.h>
#include <utils/threads.h>
#include "com_android_server_input_InputApplicationHandle.h"
#include "android_hardware_input_InputApplicationHandle.h"
namespace android {

4
services/core/jni/com_android_server_input_InputApplicationHandle.h → core/jni/android_hardware_input_InputApplicationHandle.h
View File

@@ -17,7 +17,9 @@
#ifndef _ANDROID_SERVER_INPUT_APPLICATION_HANDLE_H
#define _ANDROID_SERVER_INPUT_APPLICATION_HANDLE_H
#include <inputflinger/InputApplication.h>
#include <string>
#include <input/InputApplication.h>
#include <nativehelper/JNIHelp.h>
#include "jni.h"

4
services/core/jni/com_android_server_input_InputWindowHandle.cpp → core/jni/android_hardware_input_InputWindowHandle.cpp
View File

@@ -25,8 +25,8 @@
#include <android/graphics/Region.h>
#include <ui/Region.h>
#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 {

2
services/core/jni/com_android_server_input_InputWindowHandle.h → core/jni/android_hardware_input_InputWindowHandle.h
View File

@@ -17,7 +17,7 @@
#ifndef _ANDROID_SERVER_INPUT_WINDOW_HANDLE_H
#define _ANDROID_SERVER_INPUT_WINDOW_HANDLE_H
#include <inputflinger/InputWindow.h>
#include <input/InputWindow.h>
#include <nativehelper/JNIHelp.h>
#include "jni.h"

2
services/core/jni/Android.bp
View File

@@ -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",

4
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -60,8 +60,8 @@
#include <nativehelper/ScopedUtfChars.h>
#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 " "