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

Commit 1e5e9b7b authored by Antonio Kantek's avatar Antonio Kantek Committed by Android (Google) Code Review
Browse files

Merge "(2nd try) Bind an input device via descriptor" into main

parents dbfccdff 0180fe90

core/api/test-current.txt

+4 −2
Original line number Diff line number Diff line
@@ -1770,14 +1770,16 @@ package android.hardware.input { 
  }



  public final class InputManager {

    method public void addUniqueIdAssociation(@NonNull String, @NonNull String);

    method @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void addUniqueIdAssociation(@NonNull String, @NonNull String);

    method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void addUniqueIdAssociationByDescriptor(@NonNull String, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public void clearAllModifierKeyRemappings();

    method @NonNull public java.util.List<java.lang.String> getKeyboardLayoutDescriptors();

    method @NonNull public String getKeyboardLayoutTypeForLayoutDescriptor(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public java.util.Map<java.lang.Integer,java.lang.Integer> getModifierKeyRemapping();

    method public int getMousePointerSpeed();

    method @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public void remapModifierKey(int, int);

    method public void removeUniqueIdAssociation(@NonNull String);

    method @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociation(@NonNull String);

    method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociationByDescriptor(@NonNull String);

    field public static final long BLOCK_UNTRUSTED_TOUCHES = 158002302L; // 0x96aec7eL

  }

core/api/test-lint-baseline.txt

+4 −0
Original line number Diff line number Diff line
@@ -977,8 +977,12 @@ RequiresPermission: android.hardware.hdmi.HdmiControlManager#setHdmiCecVersion(i 
    Method 'setHdmiCecVersion' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#addUniqueIdAssociation(String, String):

    Method 'addUniqueIdAssociation' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#addUniqueIdAssociationByDescriptor(String, String):

    Method 'addUniqueIdAssociationByDescriptor' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#removeUniqueIdAssociation(String):

    Method 'removeUniqueIdAssociation' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.hardware.input.InputManager#removeUniqueIdAssociationByDescriptor(String):

    Method 'removeUniqueIdAssociationByDescriptor' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.location.GeofenceHardware#addGeofence(int, int, android.hardware.location.GeofenceHardwareRequest, android.hardware.location.GeofenceHardwareCallback):

    Method 'addGeofence' documentation mentions permissions without declaring @RequiresPermission

RequiresPermission: android.hardware.location.GeofenceHardware#getMonitoringTypes():

core/java/android/hardware/input/IInputManager.aidl

+9 −2
Original line number Diff line number Diff line
@@ -165,9 +165,16 @@ interface IInputManager { 
    // static association for the cleared input port will be restored.

    void removePortAssociation(in String inputPort);



    // Add a runtime association between the input device and display.

    // Add a runtime association between the input device and display, using device's descriptor.

    void addUniqueIdAssociationByDescriptor(in String inputDeviceDescriptor,

            in String displayUniqueId);

    // Remove the runtime association between the input device and display, using device's

    // descriptor.

    void removeUniqueIdAssociationByDescriptor(in String inputDeviceDescriptor);



    // Add a runtime association between the input device and display, using device's port.

    void addUniqueIdAssociation(in String inputPort, in String displayUniqueId);

    // Remove the runtime association between the input device and display.

    // Remove the runtime association between the input device and display, using device's port.

    void removeUniqueIdAssociation(in String inputPort);



    InputSensorInfo[] getSensorList(int deviceId);

core/java/android/hardware/input/InputManager.java

+53 −6
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.input;



import static com.android.input.flags.Flags.FLAG_INPUT_DEVICE_VIEW_BEHAVIOR_API;

import static com.android.input.flags.Flags.FLAG_DEVICE_ASSOCIATIONS;

import static com.android.hardware.input.Flags.keyboardLayoutPreviewFlag;



import android.Manifest;
@@ -1054,13 +1055,14 @@ public final class InputManager { 
    /**

     * Add a runtime association between the input port and the display port. This overrides any

     * static associations.

     * @param inputPort The port of the input device.

     * @param displayPort The physical port of the associated display.

     * @param inputPort the port of the input device

     * @param displayPort the physical port of the associated display

     * <p>

     * Requires {@link android.Manifest.permission#ASSOCIATE_INPUT_DEVICE_TO_DISPLAY}.

     * </p>

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY)

    public void addPortAssociation(@NonNull String inputPort, int displayPort) {

        try {

            mIm.addPortAssociation(inputPort, displayPort);
@@ -1072,12 +1074,13 @@ public final class InputManager { 
    /**

     * Remove the runtime association between the input port and the display port. Any existing

     * static association for the cleared input port will be restored.

     * @param inputPort The port of the input device to be cleared.

     * @param inputPort the port of the input device to be cleared

     * <p>

     * Requires {@link android.Manifest.permission#ASSOCIATE_INPUT_DEVICE_TO_DISPLAY}.

     * </p>

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY)

    public void removePortAssociation(@NonNull String inputPort) {

        try {

            mIm.removePortAssociation(inputPort);
@@ -1089,14 +1092,16 @@ public final class InputManager { 
    /**

     * Add a runtime association between the input port and display, by unique id. Input ports are

     * expected to be unique.

     * @param inputPort The port of the input device.

     * @param displayUniqueId The unique id of the associated display.

     * @param inputPort the port of the input device

     * @param displayUniqueId the unique id of the associated display

     * <p>

     * Requires {@link android.Manifest.permission#ASSOCIATE_INPUT_DEVICE_TO_DISPLAY}.

     * </p>

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY)

    @TestApi

    // TODO(b/324075859): Rename to addUniqueIdAssociationByPort

    public void addUniqueIdAssociation(@NonNull String inputPort,

            @NonNull String displayUniqueId) {

        mGlobal.addUniqueIdAssociation(inputPort, displayUniqueId);
@@ -1104,17 +1109,59 @@ public final class InputManager { 


    /**

     * Removes a runtime association between the input device and display.

     * @param inputPort The port of the input device.

     * @param inputPort the port of the input device

     * <p>

     * Requires {@link android.Manifest.permission#ASSOCIATE_INPUT_DEVICE_TO_DISPLAY}.

     * </p>

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY)

    @TestApi

    // TODO(b/324075859): Rename to removeUniqueIdAssociationByPort

    public void removeUniqueIdAssociation(@NonNull String inputPort) {

        mGlobal.removeUniqueIdAssociation(inputPort);

    }



    /**

     * Add a runtime association between the input device name and display, by descriptor. Input

     * device descriptors are expected to be unique per physical device, though one physical

     * device can have multiple virtual input devices that possess the same descriptor.

     * E.g. a keyboard with built in trackpad will be 2 different input devices with the same

     * descriptor.

     * @param inputDeviceDescriptor the descriptor of the input device

     * @param displayUniqueId the unique id of the associated display

     * <p>

     * Requires {@link android.Manifest.permissions.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY}.

     * </p>

     * @hide

     */

    @FlaggedApi(FLAG_DEVICE_ASSOCIATIONS)

    @RequiresPermission(android.Manifest.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY)

    @TestApi

    public void addUniqueIdAssociationByDescriptor(@NonNull String inputDeviceDescriptor,

                                                   @NonNull String displayUniqueId) {

        mGlobal.addUniqueIdAssociationByDescriptor(inputDeviceDescriptor, displayUniqueId);

    }



    /**

     * Removes a runtime association between the input device and display.

    }



    /**

     * Removes a runtime association between the input device and display.

     * @param inputDeviceDescriptor the descriptor of the input device

     * <p>

     * Requires {@link android.Manifest.permissions.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY}.

     * </p>

     * @hide

     */

    @FlaggedApi(FLAG_DEVICE_ASSOCIATIONS)

    @RequiresPermission(android.Manifest.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY)

    @TestApi

    public void removeUniqueIdAssociationByDescriptor(@NonNull String inputDeviceDescriptor) {

        mGlobal.removeUniqueIdAssociationByDescriptor(inputDeviceDescriptor);

    }



    /**

     * Reports the version of the Universal Stylus Initiative (USI) protocol supported by the given

     * display, if any.

core/java/android/hardware/input/InputManagerGlobal.java

+23 −0
Original line number Diff line number Diff line
@@ -1488,6 +1488,29 @@ public final class InputManagerGlobal { 
        }

    }



    /**

     * @see InputManager#addUniqueIdAssociationByDescriptor(String, String)

     */

    public void addUniqueIdAssociationByDescriptor(@NonNull String inputDeviceDescriptor,

                                                   @NonNull String displayUniqueId) {

        try {

            mIm.addUniqueIdAssociationByDescriptor(inputDeviceDescriptor, displayUniqueId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @see InputManager#removeUniqueIdAssociationByDescriptor(String)

     */

    public void removeUniqueIdAssociationByDescriptor(@NonNull String inputDeviceDescriptor) {

        try {

            mIm.removeUniqueIdAssociationByDescriptor(inputDeviceDescriptor);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @see InputManager#getInputDeviceBluetoothAddress(int)

     */