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

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

Merge "(2nd try) Rename {add|remove}UniqueIdAssociation by appending ByPort suffix" into main

parents 28132167 ba1f9a2c

core/api/test-current.txt

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



  public final class InputManager {

    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.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void addUniqueIdAssociationByPort(@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 @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);

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

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

  }

core/api/test-lint-baseline.txt

+8 −4
Original line number Diff line number Diff line
@@ -975,14 +975,14 @@ RequiresPermission: android.hardware.hdmi.HdmiControlManager#getHdmiCecVersion() 
    Method 'getHdmiCecVersion' documentation mentions permissions already declared by @RequiresPermission

RequiresPermission: android.hardware.hdmi.HdmiControlManager#setHdmiCecVersion(int):

    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#addUniqueIdAssociationByPort(String, String):

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

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

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

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

    Method 'removeUniqueIdAssociationByPort' 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():
@@ -2035,6 +2035,10 @@ UnflaggedApi: android.content.pm.UserInfo#isPrivateProfile(): 
    New API must be flagged with @FlaggedApi: method android.content.pm.UserInfo.isPrivateProfile()

UnflaggedApi: android.credentials.CredentialProviderInfo#isPrimary():

    New API must be flagged with @FlaggedApi: method android.credentials.CredentialProviderInfo.isPrimary()

UnflaggedApi: android.hardware.input.InputManager#addUniqueIdAssociationByPort(String, String):

    New API must be flagged with @FlaggedApi: method android.hardware.input.InputManager.addUniqueIdAssociationByPort(String,String)

UnflaggedApi: android.hardware.input.InputManager#removeUniqueIdAssociationByPort(String):

    New API must be flagged with @FlaggedApi: method android.hardware.input.InputManager.removeUniqueIdAssociationByPort(String)

UnflaggedApi: android.media.AudioManager#enterAudioFocusFreezeForTest(java.util.List<java.lang.Integer>):

    New API must be flagged with @FlaggedApi: method android.media.AudioManager.enterAudioFocusFreezeForTest(java.util.List<java.lang.Integer>)

UnflaggedApi: android.media.AudioManager#exitAudioFocusFreezeForTest():

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

+2 −2
Original line number Diff line number Diff line
@@ -171,9 +171,9 @@ interface IInputManager { 
    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);

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

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

    void removeUniqueIdAssociation(in String inputPort);

    void removeUniqueIdAssociationByPort(in String inputPort);



    InputSensorInfo[] getSensorList(int deviceId);

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

+4 −6
Original line number Diff line number Diff line
@@ -1094,10 +1094,9 @@ public final class InputManager { 
     */

    @RequiresPermission(android.Manifest.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY)

    @TestApi

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

    public void addUniqueIdAssociation(@NonNull String inputPort,

    public void addUniqueIdAssociationByPort(@NonNull String inputPort,

            @NonNull String displayUniqueId) {

        mGlobal.addUniqueIdAssociation(inputPort, displayUniqueId);

        mGlobal.addUniqueIdAssociationByPort(inputPort, displayUniqueId);

    }



    /**
@@ -1110,9 +1109,8 @@ public final class InputManager { 
     */

    @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);

    public void removeUniqueIdAssociationByPort(@NonNull String inputPort) {

        mGlobal.removeUniqueIdAssociationByPort(inputPort);

    }



    /**

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

+7 −6
Original line number Diff line number Diff line
@@ -1445,22 +1445,23 @@ public final class InputManagerGlobal { 
    }



    /**

     * @see InputManager#addUniqueIdAssociation(String, String)

     * @see InputManager#addUniqueIdAssociationByPort(String, String)

     */

    public void addUniqueIdAssociation(@NonNull String inputPort, @NonNull String displayUniqueId) {

    public void addUniqueIdAssociationByPort(@NonNull String inputPort,

            @NonNull String displayUniqueId) {

        try {

            mIm.addUniqueIdAssociation(inputPort, displayUniqueId);

            mIm.addUniqueIdAssociationByPort(inputPort, displayUniqueId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @see InputManager#removeUniqueIdAssociation(String)

     * @see InputManager#removeUniqueIdAssociationByPort(String)

     */

    public void removeUniqueIdAssociation(@NonNull String inputPort) {

    public void removeUniqueIdAssociationByPort(@NonNull String inputPort) {

        try {

            mIm.removeUniqueIdAssociation(inputPort);

            mIm.removeUniqueIdAssociationByPort(inputPort);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }