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

Commit dcf5b75b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "InputFlinger Split: Use libinputreader in InputManagerService"

parents 358b9f6c e5696a5c

libs/input/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -28,10 +28,13 @@ cc_library_shared { 
        "libgui",

        "libui",

        "libinput",

        "libinputflinger",

        "libnativewindow",

    ],



    header_libs: [

        "libinputflinger_headers",

    ],



    include_dirs: ["frameworks/native/services"],



    cflags: [

libs/input/PointerController.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <ui/DisplayInfo.h>

#include <input/Input.h>

#include <inputflinger/PointerControllerInterface.h>

#include <PointerControllerInterface.h>

#include <utils/BitSet.h>

#include <utils/RefBase.h>

#include <utils/Looper.h>

services/core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ cc_defaults { 
        "libui",

        "libinput",

        "libinputflinger",

        "libinputflinger_base",

        "libinputservice",

        "libschedulerservicehidl",

        "libsensorservice",

services/core/jni/com_android_server_input_InputManagerService.cpp

+1 −2
Original line number Diff line number Diff line
@@ -341,8 +341,7 @@ NativeInputManager::NativeInputManager(jobject contextObj, 
    }

    mInteractive = true;



    sp<EventHub> eventHub = new EventHub();

    mInputManager = new InputManager(eventHub, this, this);

    mInputManager = new InputManager(this, this);

}



NativeInputManager::~NativeInputManager() {