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

Commit 857aa7be authored by Jason Gerecke's avatar Jason Gerecke Committed by Michael Wright
Browse files

Initialize mAffineTransform and update on modification 

This patch causes the InputReader to update its mAffineTransform to reflect
the currently-set calibration on startup and whenever its value is changed
through the InputManagerService.

Change-Id: I81c76e8cf168728ee140abaf148e1cd31687d5af
parent d6396d67

services/core/java/com/android/server/input/InputManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ public class InputManagerService extends IInputManager.Stub 
            InputChannel fromChannel, InputChannel toChannel);

    private static native void nativeSetPointerSpeed(long ptr, int speed);

    private static native void nativeSetShowTouches(long ptr, boolean enabled);

    private static native void nativeReloadCalibration(long ptr);

    private static native void nativeVibrate(long ptr, int deviceId, long[] pattern,

            int repeat, int token);

    private static native void nativeCancelVibrate(long ptr, int deviceId, int token);
@@ -701,7 +702,7 @@ public class InputManagerService extends IInputManager.Stub 
        mTempFullKeyboards.clear();

    }



    @Override // Binder call

    @Override // Binder call & native callback

    public TouchCalibration getTouchCalibrationForInputDevice(String inputDeviceDescriptor) {

        if (inputDeviceDescriptor == null) {

            throw new IllegalArgumentException("inputDeviceDescriptor must not be null");
@@ -728,7 +729,9 @@ public class InputManagerService extends IInputManager.Stub 


        synchronized (mDataStore) {

            try {

                mDataStore.setTouchCalibration(inputDeviceDescriptor, calibration);

                if (mDataStore.setTouchCalibration(inputDeviceDescriptor, calibration)) {

                    nativeReloadCalibration(mPtr);

                }

            } finally {

                mDataStore.saveIfNeeded();

            }

services/core/jni/com_android_server_input_InputManagerService.cpp

+70 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <android/graphics/GraphicsJNI.h>



#include <ScopedLocalRef.h>

#include <ScopedPrimitiveArray.h>

#include <ScopedUtfChars.h>



#include "com_android_server_power_PowerManagerService.h"
@@ -86,6 +87,7 @@ static struct { 
    jmethodID getPointerIcon;

    jmethodID getKeyboardLayoutOverlay;

    jmethodID getDeviceAlias;

    jmethodID getTouchCalibrationForInputDevice;

} gServiceClassInfo;



static struct {
@@ -105,6 +107,11 @@ static struct { 
    jmethodID constructor;

} gInputDeviceIdentifierInfo;



static struct {

    jclass clazz;

    jmethodID getAffineTransform;

} gTouchCalibrationClassInfo;







// --- Global functions ---
@@ -182,6 +189,7 @@ public: 
    void setSystemUiVisibility(int32_t visibility);

    void setPointerSpeed(int32_t speed);

    void setShowTouches(bool enabled);

    void reloadCalibration();



    /* --- InputReaderPolicyInterface implementation --- */
@@ -190,6 +198,8 @@ public: 
    virtual void notifyInputDevicesChanged(const Vector<InputDeviceInfo>& inputDevices);

    virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const InputDeviceIdentifier& identifier);

    virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier);

    TouchAffineTransformation getTouchAffineTransformation(JNIEnv *env, jfloatArray matrixArr);

    TouchAffineTransformation getTouchAffineTransformation(const String8& inputDeviceDescriptor);



    /* --- InputDispatcherPolicyInterface implementation --- */
@@ -741,6 +751,11 @@ void NativeInputManager::setShowTouches(bool enabled) { 
            InputReaderConfiguration::CHANGE_SHOW_TOUCHES);

}



void NativeInputManager::reloadCalibration() {

    mInputManager->getReader()->requestRefreshConfiguration(

            InputReaderConfiguration::TOUCH_AFFINE_TRANSFORMATION);

}



bool NativeInputManager::isScreenOn() {

    return android_server_PowerManagerService_isScreenOn();

}
@@ -749,6 +764,42 @@ bool NativeInputManager::isScreenBright() { 
    return android_server_PowerManagerService_isScreenBright();

}



TouchAffineTransformation NativeInputManager::getTouchAffineTransformation(

        JNIEnv *env, jfloatArray matrixArr) {

    ScopedFloatArrayRO matrix(env, matrixArr);

    assert(matrix.size() == 6);



    TouchAffineTransformation transform;

    transform.x_scale  = matrix[0];

    transform.x_ymix   = matrix[1];

    transform.x_offset = matrix[2];

    transform.y_xmix   = matrix[3];

    transform.y_scale  = matrix[4];

    transform.y_offset = matrix[5];



    return transform;

}



TouchAffineTransformation NativeInputManager::getTouchAffineTransformation(

        const String8& inputDeviceDescriptor) {

    JNIEnv* env = jniEnv();



    ScopedLocalRef<jstring> descriptorObj(env, env->NewStringUTF(inputDeviceDescriptor.string()));



    jobject cal = env->CallObjectMethod(mServiceObj,

            gServiceClassInfo.getTouchCalibrationForInputDevice, descriptorObj.get());



    jfloatArray matrixArr = jfloatArray(env->CallObjectMethod(cal,

            gTouchCalibrationClassInfo.getAffineTransform));



    TouchAffineTransformation transform = getTouchAffineTransformation(env, matrixArr);



    env->DeleteLocalRef(matrixArr);

    env->DeleteLocalRef(cal);



    return transform;

}



bool NativeInputManager::filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags) {

    jobject inputEventObj;
@@ -1231,6 +1282,11 @@ static void nativeSetShowTouches(JNIEnv* env, 
    im->setShowTouches(enabled);

}



static void nativeReloadCalibration(JNIEnv* env, jclass clazz, jlong ptr) {

    NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);

    im->reloadCalibration();

}



static void nativeVibrate(JNIEnv* env,

        jclass clazz, jlong ptr, jint deviceId, jlongArray patternObj,

        jint repeat, jint token) {
@@ -1336,6 +1392,8 @@ static JNINativeMethod gInputManagerMethods[] = { 
            (void*) nativeSetPointerSpeed },

    { "nativeSetShowTouches", "(JZ)V",

            (void*) nativeSetShowTouches },

    { "nativeReloadCalibration", "(J)V",

            (void*) nativeReloadCalibration },

    { "nativeVibrate", "(JI[JII)V",

            (void*) nativeVibrate },

    { "nativeCancelVibrate", "(JII)V",
@@ -1446,6 +1504,10 @@ int register_android_server_InputManager(JNIEnv* env) { 
    GET_METHOD_ID(gServiceClassInfo.getDeviceAlias, clazz,

            "getDeviceAlias", "(Ljava/lang/String;)Ljava/lang/String;");



    GET_METHOD_ID(gServiceClassInfo.getTouchCalibrationForInputDevice, clazz,

            "getTouchCalibrationForInputDevice",

            "(Ljava/lang/String;)Landroid/hardware/input/TouchCalibration;");



    // InputDevice



    FIND_CLASS(gInputDeviceClassInfo.clazz, "android/view/InputDevice");
@@ -1468,6 +1530,14 @@ int register_android_server_InputManager(JNIEnv* env) { 
    GET_METHOD_ID(gInputDeviceIdentifierInfo.constructor, gInputDeviceIdentifierInfo.clazz,

            "<init>", "(Ljava/lang/String;II)V");



    // TouchCalibration



    FIND_CLASS(gTouchCalibrationClassInfo.clazz, "android/hardware/input/TouchCalibration");

    gTouchCalibrationClassInfo.clazz = jclass(env->NewGlobalRef(gTouchCalibrationClassInfo.clazz));



    GET_METHOD_ID(gTouchCalibrationClassInfo.getAffineTransform, gTouchCalibrationClassInfo.clazz,

            "getAffineTransform", "()[F");



    return 0;

}