Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1db3206 authored by Robert Carr's avatar Robert Carr Committed by Rob Carr
Browse files

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
parent e2241203

core/jni/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -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: [

services/core/jni/com_android_server_input_InputApplicationHandle.cpp→core/jni/android_hardware_input_InputApplicationHandle.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 {

services/core/jni/com_android_server_input_InputApplicationHandle.h→core/jni/android_hardware_input_InputApplicationHandle.h

+3 −1
Original line number Diff line number Diff line
@@ -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"

services/core/jni/com_android_server_input_InputWindowHandle.cpp→core/jni/android_hardware_input_InputWindowHandle.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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 {

services/core/jni/com_android_server_input_InputWindowHandle.h→core/jni/android_hardware_input_InputWindowHandle.h

+1 −1
Original line number Diff line number Diff line
@@ -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"