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

Commit e051a7b2 authored by Antonio Kantek's avatar Antonio Kantek Committed by Automerger Merge Worker
Browse files

Merge "Remove NativeInputManager::isPerDisplayTouchModeEnabled" into udc-dev am: 921d0185 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22254257



Change-Id: I90ed38e1855750232450f5845c9e0deb684cfcfe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9bac412 921d0185

services/core/jni/com_android_server_input_InputManagerService.cpp

+3 −17
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static struct { 
    jmethodID getContextForDisplay;

    jmethodID notifyDropWindow;

    jmethodID getParentSurfaceForPointers;

    jmethodID isPerDisplayTouchModeEnabled;

    jmethodID isStylusPointerIconEnabled;

} gServiceClassInfo;



static struct {
@@ -369,10 +369,6 @@ public: 
    virtual PointerIconStyle getCustomPointerIconId();

    virtual void onPointerDisplayIdChanged(int32_t displayId, const FloatPoint& position);



    /* --- If touch mode is enabled per display or global --- */



    virtual bool isPerDisplayTouchModeEnabled();



private:

    sp<InputManagerInterface> mInputManager;
@@ -1645,16 +1641,6 @@ void NativeInputManager::setStylusButtonMotionEventsEnabled(bool enabled) { 
            InputReaderConfiguration::CHANGE_STYLUS_BUTTON_REPORTING);

}



bool NativeInputManager::isPerDisplayTouchModeEnabled() {

    JNIEnv* env = jniEnv();

    jboolean enabled =

            env->CallBooleanMethod(mServiceObj, gServiceClassInfo.isPerDisplayTouchModeEnabled);

    if (checkAndClearExceptionFromCallback(env, "isPerDisplayTouchModeEnabled")) {

        return false;

    }

    return static_cast<bool>(enabled);

}



FloatPoint NativeInputManager::getMouseCursorPosition() {

    std::scoped_lock _l(mLock);

    const auto pc = mLocked.pointerController.lock();
@@ -2837,8 +2823,8 @@ int register_android_server_InputManager(JNIEnv* env) { 
    GET_METHOD_ID(gServiceClassInfo.getParentSurfaceForPointers, clazz,

                  "getParentSurfaceForPointers", "(I)J");



    GET_METHOD_ID(gServiceClassInfo.isPerDisplayTouchModeEnabled, clazz,

                  "isPerDisplayTouchModeEnabled", "()Z");

    GET_METHOD_ID(gServiceClassInfo.isStylusPointerIconEnabled, clazz, "isStylusPointerIconEnabled",

                  "()Z");



    // InputDevice