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

Commit d15162cb authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge "Migrate internal pilferPointers usages to InputManager call"

parents 365a8d33 fcfc1391

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

+0 −6
Original line number Diff line number Diff line
@@ -135,12 +135,6 @@ public abstract class InputManagerInternal { 
    /** Create an {@link InputChannel} that is registered to InputDispatcher. */

    public abstract InputChannel createInputChannel(String inputChannelName);



    /**

     * Pilfer pointers from the input channel with the given token so that ongoing gestures are

     * canceled for all other channels.

     */

    public abstract void pilferPointers(IBinder token);



    /**

     * Increments keyboard backlight level if the device has an associated keyboard backlight

     * {@see Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT}

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

+0 −5
Original line number Diff line number Diff line
@@ -3781,11 +3781,6 @@ public class InputManagerService extends IInputManager.Stub 
            return InputManagerService.this.createInputChannel(inputChannelName);

        }



        @Override

        public void pilferPointers(IBinder token) {

            mNative.pilferPointers(token);

        }



        @Override

        public void incrementKeyboardBacklight(int deviceId) {

            mKeyboardBacklightController.incrementKeyboardBacklight(deviceId);

services/core/java/com/android/server/inputmethod/HandwritingModeController.java

+5 −1
Original line number Diff line number Diff line
@@ -18,9 +18,12 @@ package com.android.server.inputmethod; 


import static android.view.InputDevice.SOURCE_STYLUS;



import android.Manifest;

import android.annotation.AnyThread;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.UiThread;

import android.hardware.input.InputManager;

import android.os.IBinder;

import android.os.Looper;

import android.util.Slog;
@@ -141,6 +144,7 @@ final class HandwritingModeController { 
     * input events and disposing the input event receiver.

     * @return the handwriting session to send to the IME, or null if the request was invalid.

     */

    @RequiresPermission(Manifest.permission.MONITOR_INPUT)

    @UiThread

    @Nullable

    HandwritingSession startHandwritingSession(
@@ -169,7 +173,7 @@ final class HandwritingModeController { 
        }

        if (DEBUG) Slog.d(TAG, "Starting handwriting session in display: " + mCurrentDisplayId);



        mInputManagerInternal.pilferPointers(mHandwritingSurface.getInputChannel().getToken());

        InputManager.getInstance().pilferPointers(mHandwritingSurface.getInputChannel().getToken());



        // Stop processing more events.

        mHandwritingEventReceiver.dispose();