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

Commit dbb5d650 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Remove old PK Settings APIs 

NOTE: Working with Settings and Emulator teams to remove the
function calls for old APIs and once those API calls
are removed, we can safely remove these methods. Until then,
we are replacing them with empty methods.

Test: None
Bug: 330517633
Change-Id: I2e39c6333fa480b3b6d1821084433e05ad0dbdd7
parent 5ff2ae9b

core/api/test-current.txt

+1 −4
Original line number Diff line number Diff line
@@ -1765,15 +1765,12 @@ package android.hardware.input { 
  public final class InputManager {

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

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

    method @Nullable public String getCurrentKeyboardLayoutForInputDevice(@NonNull android.hardware.input.InputDeviceIdentifier);

    method @NonNull public java.util.List<java.lang.String> getKeyboardLayoutDescriptorsForInputDevice(@NonNull android.view.InputDevice);

    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.Manifest.permission.SET_KEYBOARD_LAYOUT) public void removeKeyboardLayoutForInputDevice(@NonNull android.hardware.input.InputDeviceIdentifier, @NonNull String);

    method public void removeUniqueIdAssociation(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.SET_KEYBOARD_LAYOUT) public void setCurrentKeyboardLayoutForInputDevice(@NonNull android.hardware.input.InputDeviceIdentifier, @NonNull String);

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

  }

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

+0 −25
Original line number Diff line number Diff line
@@ -94,33 +94,8 @@ interface IInputManager { 
    // Keyboard layouts configuration.

    KeyboardLayout[] getKeyboardLayouts();



    KeyboardLayout[] getKeyboardLayoutsForInputDevice(in InputDeviceIdentifier identifier);



    KeyboardLayout getKeyboardLayout(String keyboardLayoutDescriptor);



    String getCurrentKeyboardLayoutForInputDevice(in InputDeviceIdentifier identifier);



    @EnforcePermission("SET_KEYBOARD_LAYOUT")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.SET_KEYBOARD_LAYOUT)")

    void setCurrentKeyboardLayoutForInputDevice(in InputDeviceIdentifier identifier,

            String keyboardLayoutDescriptor);



    String[] getEnabledKeyboardLayoutsForInputDevice(in InputDeviceIdentifier identifier);



    @EnforcePermission("SET_KEYBOARD_LAYOUT")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.SET_KEYBOARD_LAYOUT)")

    void addKeyboardLayoutForInputDevice(in InputDeviceIdentifier identifier,

            String keyboardLayoutDescriptor);



    @EnforcePermission("SET_KEYBOARD_LAYOUT")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.SET_KEYBOARD_LAYOUT)")

    void removeKeyboardLayoutForInputDevice(in InputDeviceIdentifier identifier,

            String keyboardLayoutDescriptor);



    // New Keyboard layout config APIs

    KeyboardLayoutSelectionResult getKeyboardLayoutForInputDevice(

            in InputDeviceIdentifier identifier, int userId, in InputMethodInfo imeInfo,

            in InputMethodSubtype imeSubtype);

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

+17 −108
Original line number Diff line number Diff line
@@ -473,22 +473,21 @@ public final class InputManager { 
    }



    /**

     * Returns the descriptors of all supported keyboard layouts appropriate for the specified

     * input device.

     * Returns the descriptors of all supported keyboard layouts.

     * <p>

     * The input manager consults the built-in keyboard layouts as well as all keyboard layouts

     * advertised by applications using a {@link #ACTION_QUERY_KEYBOARD_LAYOUTS} broadcast receiver.

     * </p>

     *

     * @param device The input device to query.

     * @return The ids of all keyboard layouts which are supported by the specified input device.

     *

     * @hide

     */

    @TestApi

    @NonNull

    public List<String> getKeyboardLayoutDescriptorsForInputDevice(@NonNull InputDevice device) {

        KeyboardLayout[] layouts = getKeyboardLayoutsForInputDevice(device.getIdentifier());

    @SuppressLint("UnflaggedApi")

    public List<String> getKeyboardLayoutDescriptors() {

        KeyboardLayout[] layouts = getKeyboardLayouts();

        List<String> res = new ArrayList<>();

        for (KeyboardLayout kl : layouts) {

            res.add(kl.getDescriptor());
@@ -511,33 +510,18 @@ public final class InputManager { 
    @TestApi

    @NonNull

    public String getKeyboardLayoutTypeForLayoutDescriptor(@NonNull String layoutDescriptor) {

        KeyboardLayout[] layouts = getKeyboardLayouts();

        for (KeyboardLayout kl : layouts) {

            if (layoutDescriptor.equals(kl.getDescriptor())) {

                return kl.getLayoutType();

            }

        }

        return "";

        KeyboardLayout layout = getKeyboardLayout(layoutDescriptor);

        return layout == null ? "" : layout.getLayoutType();

    }



    /**

     * Gets information about all supported keyboard layouts appropriate

     * for a specific input device.

     * <p>

     * The input manager consults the built-in keyboard layouts as well

     * as all keyboard layouts advertised by applications using a

     * {@link #ACTION_QUERY_KEYBOARD_LAYOUTS} broadcast receiver.

     * </p>

     *

     * @return A list of all supported keyboard layouts for a specific

     * input device.

     *

     * TODO(b/330517633): Cleanup the unsupported API

     * @hide

     */

    @NonNull

    public KeyboardLayout[] getKeyboardLayoutsForInputDevice(

            @NonNull InputDeviceIdentifier identifier) {

        return mGlobal.getKeyboardLayoutsForInputDevice(identifier);

        return new KeyboardLayout[0];

    }



    /**
@@ -549,6 +533,7 @@ public final class InputManager { 
     *

     * @hide

     */

    @Nullable

    public KeyboardLayout getKeyboardLayout(String keyboardLayoutDescriptor) {

        if (keyboardLayoutDescriptor == null) {

            throw new IllegalArgumentException("keyboardLayoutDescriptor must not be null");
@@ -562,121 +547,45 @@ public final class InputManager { 
    }



    /**

     * Gets the current keyboard layout descriptor for the specified input device.

     *

     * @param identifier Identifier for the input device

     * @return The keyboard layout descriptor, or null if no keyboard layout has been set.

     *

     * TODO(b/330517633): Cleanup the unsupported API

     * @hide

     */

    @TestApi

    @Nullable

    public String getCurrentKeyboardLayoutForInputDevice(

            @NonNull InputDeviceIdentifier identifier) {

        try {

            return mIm.getCurrentKeyboardLayoutForInputDevice(identifier);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

        return null;

    }



    /**

     * Sets the current keyboard layout descriptor for the specified input device.

     * <p>

     * This method may have the side-effect of causing the input device in question to be

     * reconfigured.

     * </p>

     *

     * @param identifier The identifier for the input device.

     * @param keyboardLayoutDescriptor The keyboard layout descriptor to use, must not be null.

     *

     * TODO(b/330517633): Cleanup the unsupported API

     * @hide

     */

    @TestApi

    @RequiresPermission(Manifest.permission.SET_KEYBOARD_LAYOUT)

    public void setCurrentKeyboardLayoutForInputDevice(@NonNull InputDeviceIdentifier identifier,

            @NonNull String keyboardLayoutDescriptor) {

        mGlobal.setCurrentKeyboardLayoutForInputDevice(identifier,

                keyboardLayoutDescriptor);

    }

            @NonNull String keyboardLayoutDescriptor) {}



    /**

     * Gets all keyboard layout descriptors that are enabled for the specified input device.

     *

     * @param identifier The identifier for the input device.

     * @return The keyboard layout descriptors.

     *

     * TODO(b/330517633): Cleanup the unsupported API

     * @hide

     */

    public String[] getEnabledKeyboardLayoutsForInputDevice(InputDeviceIdentifier identifier) {

        if (identifier == null) {

            throw new IllegalArgumentException("inputDeviceDescriptor must not be null");

        }



        try {

            return mIm.getEnabledKeyboardLayoutsForInputDevice(identifier);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

        return new String[0];

    }



    /**

     * Adds the keyboard layout descriptor for the specified input device.

     * <p>

     * This method may have the side-effect of causing the input device in question to be

     * reconfigured.

     * </p>

     *

     * @param identifier The identifier for the input device.

     * @param keyboardLayoutDescriptor The descriptor of the keyboard layout to add.

     *

     * TODO(b/330517633): Cleanup the unsupported API

     * @hide

     */

    @RequiresPermission(Manifest.permission.SET_KEYBOARD_LAYOUT)

    public void addKeyboardLayoutForInputDevice(InputDeviceIdentifier identifier,

            String keyboardLayoutDescriptor) {

        if (identifier == null) {

            throw new IllegalArgumentException("inputDeviceDescriptor must not be null");

        }

        if (keyboardLayoutDescriptor == null) {

            throw new IllegalArgumentException("keyboardLayoutDescriptor must not be null");

        }



        try {

            mIm.addKeyboardLayoutForInputDevice(identifier, keyboardLayoutDescriptor);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }



    /**

     * Removes the keyboard layout descriptor for the specified input device.

     * <p>

     * This method may have the side-effect of causing the input device in question to be

     * reconfigured.

     * </p>

     *

     * @param identifier The identifier for the input device.

     * @param keyboardLayoutDescriptor The descriptor of the keyboard layout to remove.

     *

     * TODO(b/330517633): Cleanup the unsupported API

     * @hide

     */

    @TestApi

    @RequiresPermission(Manifest.permission.SET_KEYBOARD_LAYOUT)

    public void removeKeyboardLayoutForInputDevice(@NonNull InputDeviceIdentifier identifier,

            @NonNull String keyboardLayoutDescriptor) {

        if (identifier == null) {

            throw new IllegalArgumentException("inputDeviceDescriptor must not be null");

        }

        if (keyboardLayoutDescriptor == null) {

            throw new IllegalArgumentException("keyboardLayoutDescriptor must not be null");

        }



        try {

            mIm.removeKeyboardLayoutForInputDevice(identifier, keyboardLayoutDescriptor);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }



    /**

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

+5 −20
Original line number Diff line number Diff line
@@ -1068,36 +1068,21 @@ public final class InputManagerGlobal { 
    }



    /**

     * @see InputManager#getKeyboardLayoutsForInputDevice(InputDeviceIdentifier)

     * TODO(b/330517633): Cleanup the unsupported API

     */

    @NonNull

    public KeyboardLayout[] getKeyboardLayoutsForInputDevice(

            @NonNull InputDeviceIdentifier identifier) {

        try {

            return mIm.getKeyboardLayoutsForInputDevice(identifier);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

        return new KeyboardLayout[0];

    }



    /**

     * @see InputManager#setCurrentKeyboardLayoutForInputDevice

     * (InputDeviceIdentifier, String)

     * TODO(b/330517633): Cleanup the unsupported API

     */

    @RequiresPermission(Manifest.permission.SET_KEYBOARD_LAYOUT)

    public void setCurrentKeyboardLayoutForInputDevice(

            @NonNull InputDeviceIdentifier identifier,

            @NonNull String keyboardLayoutDescriptor) {

        Objects.requireNonNull(identifier, "identifier must not be null");

        Objects.requireNonNull(keyboardLayoutDescriptor,

                "keyboardLayoutDescriptor must not be null");

        try {

            mIm.setCurrentKeyboardLayoutForInputDevice(identifier,

                    keyboardLayoutDescriptor);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }

            @NonNull String keyboardLayoutDescriptor) {}





    /**

     * @see InputDevice#getSensorManager()

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

+0 −48
Original line number Diff line number Diff line
@@ -1196,54 +1196,11 @@ public class InputManagerService extends IInputManager.Stub 
        return mKeyboardLayoutManager.getKeyboardLayouts();

    }



    @Override // Binder call

    public KeyboardLayout[] getKeyboardLayoutsForInputDevice(

            final InputDeviceIdentifier identifier) {

        return mKeyboardLayoutManager.getKeyboardLayoutsForInputDevice(identifier);

    }



    @Override // Binder call

    public KeyboardLayout getKeyboardLayout(String keyboardLayoutDescriptor) {

        return mKeyboardLayoutManager.getKeyboardLayout(keyboardLayoutDescriptor);

    }



    @Override // Binder call

    public String getCurrentKeyboardLayoutForInputDevice(InputDeviceIdentifier identifier) {

        return mKeyboardLayoutManager.getCurrentKeyboardLayoutForInputDevice(identifier);

    }



    @EnforcePermission(Manifest.permission.SET_KEYBOARD_LAYOUT)

    @Override // Binder call

    public void setCurrentKeyboardLayoutForInputDevice(InputDeviceIdentifier identifier,

            String keyboardLayoutDescriptor) {

        super.setCurrentKeyboardLayoutForInputDevice_enforcePermission();

        mKeyboardLayoutManager.setCurrentKeyboardLayoutForInputDevice(identifier,

                keyboardLayoutDescriptor);

    }



    @Override // Binder call

    public String[] getEnabledKeyboardLayoutsForInputDevice(InputDeviceIdentifier identifier) {

        return mKeyboardLayoutManager.getEnabledKeyboardLayoutsForInputDevice(identifier);

    }



    @EnforcePermission(Manifest.permission.SET_KEYBOARD_LAYOUT)

    @Override // Binder call

    public void addKeyboardLayoutForInputDevice(InputDeviceIdentifier identifier,

            String keyboardLayoutDescriptor) {

        super.addKeyboardLayoutForInputDevice_enforcePermission();

        mKeyboardLayoutManager.addKeyboardLayoutForInputDevice(identifier,

                keyboardLayoutDescriptor);

    }



    @EnforcePermission(Manifest.permission.SET_KEYBOARD_LAYOUT)

    @Override // Binder call

    public void removeKeyboardLayoutForInputDevice(InputDeviceIdentifier identifier,

            String keyboardLayoutDescriptor) {

        super.removeKeyboardLayoutForInputDevice_enforcePermission();

        mKeyboardLayoutManager.removeKeyboardLayoutForInputDevice(identifier,

                keyboardLayoutDescriptor);

    }



    @Override // Binder call

    public KeyboardLayoutSelectionResult getKeyboardLayoutForInputDevice(

            InputDeviceIdentifier identifier, @UserIdInt int userId,
@@ -1270,11 +1227,6 @@ public class InputManagerService extends IInputManager.Stub 
                imeInfo, imeSubtype);

    }





    public void switchKeyboardLayout(int deviceId, int direction) {

        mKeyboardLayoutManager.switchKeyboardLayout(deviceId, direction);

    }



    public void setFocusedApplication(int displayId, InputApplicationHandle application) {

        mNative.setFocusedApplication(displayId, application);

    }