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

Commit ad5b112f authored by Byoungho Jung's avatar Byoungho Jung Committed by Cherrypicker Worker
Browse files

Remove onPointerDisplayIdChanged 

Cleanup after PointerChoreographer refactor

Bug: 311416205
Test: build, presubmit
(cherry picked from https://partner-android-review.googlesource.com/q/commit:0a5dd89f919901a0a17440d61aad55aafe54f2f1)
Merged-In: I7984d326a37180cdda9f18c83430569abf3b1a4e
Change-Id: I7984d326a37180cdda9f18c83430569abf3b1a4e
parent 6a9bfe6f

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

+0 −18
Original line number Diff line number Diff line
@@ -2671,24 +2671,6 @@ public class InputManagerService extends IInputManager.Stub 
        return null;

    }



    private static class PointerDisplayIdChangedArgs {

        final int mPointerDisplayId;

        final float mXPosition;

        final float mYPosition;

        PointerDisplayIdChangedArgs(int pointerDisplayId, float xPosition, float yPosition) {

            mPointerDisplayId = pointerDisplayId;

            mXPosition = xPosition;

            mYPosition = yPosition;

        }

    }



    // Native callback.

    @SuppressWarnings("unused")

    @VisibleForTesting

    void onPointerDisplayIdChanged(int pointerDisplayId, float xPosition, float yPosition) {

        // TODO(b/311416205): Remove.

    }



    @Override

    @EnforcePermission(Manifest.permission.MONITOR_STICKY_MODIFIER_STATE)

    public void registerStickyModifierStateListener(

services/core/jni/com_android_server_input_InputManagerService.cpp

+0 −10
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ static struct { 
    jmethodID interceptMotionBeforeQueueingNonInteractive;

    jmethodID interceptKeyBeforeDispatching;

    jmethodID dispatchUnhandledKey;

    jmethodID onPointerDisplayIdChanged;

    jmethodID onPointerDownOutsideFocus;

    jmethodID getVirtualKeyQuietTimeMillis;

    jmethodID getExcludedDeviceNames;
@@ -786,12 +785,6 @@ void NativeInputManager::notifyPointerDisplayIdChanged(ui::LogicalDisplayId poin 
    } // release lock

    mInputManager->getReader().requestRefreshConfiguration(

            InputReaderConfiguration::Change::DISPLAY_INFO);



    // Notify the system.

    JNIEnv* env = jniEnv();

    env->CallVoidMethod(mServiceObj, gServiceClassInfo.onPointerDisplayIdChanged, pointerDisplayId,

                        position.x, position.y);

    checkAndClearExceptionFromCallback(env, "onPointerDisplayIdChanged");

}



void NativeInputManager::notifyStickyModifierStateChanged(uint32_t modifierState,
@@ -2933,9 +2926,6 @@ int register_android_server_InputManager(JNIEnv* env) { 
            "dispatchUnhandledKey",

            "(Landroid/os/IBinder;Landroid/view/KeyEvent;I)Landroid/view/KeyEvent;");



    GET_METHOD_ID(gServiceClassInfo.onPointerDisplayIdChanged, clazz, "onPointerDisplayIdChanged",

                  "(IFF)V");



    GET_METHOD_ID(gServiceClassInfo.notifyStickyModifierStateChanged, clazz,

                  "notifyStickyModifierStateChanged", "(II)V");