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

Commit 99b669d5 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge changes from topic "sfinput2" 

* changes:
  InputChannel JNI: Use libinput implementation of read/write.
  Move InputWindow to shared JNI from services JNI.
parents 427675a0 4de9afb7

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"