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

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

Merge changes from topics "input-device-bluetooth-address", "notify-stylus-presence" 

* changes:
  Add hidden API to query the bluetooth address of an InputDevice
  Native input manager: Add default initializers for locked members
  Introduce monitoring behavior changes for USI devices (3/n)
  Notify the policy when a stylus gesture starts
parents b8fd2091 e513b7ff

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

+7 −0
Original line number Diff line number Diff line
@@ -161,4 +161,11 @@ interface IInputManager { 
    void registerBatteryListener(int deviceId, IInputDeviceBatteryListener listener);



    void unregisterBatteryListener(int deviceId, IInputDeviceBatteryListener listener);



    // Get the bluetooth address of an input device if known, returning null if it either is not

    // connected via bluetooth or if the address cannot be determined.

    @EnforcePermission("BLUETOOTH")

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

            + "android.Manifest.permission.BLUETOOTH)")

    String getInputDeviceBluetoothAddress(int deviceId);

}

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

+18 −0
Original line number Diff line number Diff line
@@ -1480,6 +1480,24 @@ public final class InputManager { 
        }

    }



    /**

     * Returns the Bluetooth address of this input device, if known.

     *

     * The returned string is always null if this input device is not connected

     * via Bluetooth, or if the Bluetooth address of the device cannot be

     * determined. The returned address will look like: "11:22:33:44:55:66".

     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @Nullable

    public String getInputDeviceBluetoothAddress(int deviceId) {

        try {

            return mIm.getInputDeviceBluetoothAddress(deviceId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Gets a vibrator service associated with an input device, always creates a new instance.

     * @return The vibrator, never null.

core/java/android/view/InputDevice.java

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.view;



import android.Manifest;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -1009,6 +1010,22 @@ public final class InputDevice implements Parcelable { 
        mMotionRanges.add(new MotionRange(axis, source, min, max, flat, fuzz, resolution));

    }



    /**

     * Returns the Bluetooth address of this input device, if known.

     *

     * The returned string is always null if this input device is not connected

     * via Bluetooth, or if the Bluetooth address of the device cannot be

     * determined. The returned address will look like: "11:22:33:44:55:66".

     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @Nullable

    public String getBluetoothAddress() {

        // We query the address via a separate InputManager API instead of pre-populating it in

        // this class to avoid leaking it to apps that do not have sufficient permissions.

        return InputManager.getInstance().getInputDeviceBluetoothAddress(mId);

    }



    /**

     * Gets the vibrator service associated with the device, if there is one.

     * Even if the device does not have a vibrator, the result is never null.

core/jni/android_view_InputDevice.cpp

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi 
                                          deviceInfo.hasMic(), deviceInfo.hasButtonUnderPad(),

                                          deviceInfo.hasSensor(), deviceInfo.hasBattery(),

                                          deviceInfo.supportsUsi()));

    // Note: We do not populate the Bluetooth address into the InputDevice object to avoid leaking

    // it to apps that do not have the Bluetooth permission.



    const std::vector<InputDeviceInfo::MotionRange>& ranges = deviceInfo.getMotionRanges();

    for (const InputDeviceInfo::MotionRange& range: ranges) {

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

+29 −0
Original line number Diff line number Diff line
@@ -371,6 +371,17 @@ final class BatteryController { 
        }

    }



    public void notifyStylusGestureStarted(int deviceId, long eventTime) {

        synchronized (mLock) {

            final DeviceMonitor monitor = mDeviceMonitors.get(deviceId);

            if (monitor == null) {

                return;

            }



            monitor.onStylusGestureStarted(eventTime);

        }

    }



    public void dump(PrintWriter pw, String prefix) {

        synchronized (mLock) {

            final String indent = prefix + "  ";
@@ -557,6 +568,8 @@ final class BatteryController { 


        public void onTimeout(long eventTime) {}



        public void onStylusGestureStarted(long eventTime) {}



        // Returns the current battery state that can be used to notify listeners BatteryController.

        public State getBatteryStateForReporting() {

            return new State(mState);
@@ -599,6 +612,22 @@ final class BatteryController { 
            });

        }



        @Override

        public void onStylusGestureStarted(long eventTime) {

            processChangesAndNotify(eventTime, (time) -> {

                final boolean wasValid = mValidityTimeoutCallback != null;

                if (!wasValid && mState.capacity == 0.f) {

                    // Handle a special case where the USI device reports a battery capacity of 0

                    // at boot until the first battery update. To avoid wrongly sending out a

                    // battery capacity of 0 if we detect stylus presence before the capacity

                    // is first updated, do not validate the battery state when the state is not

                    // valid and the capacity is 0.

                    return;

                }

                markUsiBatteryValid();

            });

        }



        @Override

        public void onTimeout(long eventTime) {

            processChangesAndNotify(eventTime, (time) -> markUsiBatteryInvalid());