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

Commit d6233c3f authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Android (Google) Code Review
Browse files

Merge "Add nullability annotations to some InputDevice APIs"

parents adc80a9f 3d783377

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -18530,7 +18530,7 @@ package android.hardware.fingerprint { 
package android.hardware.input {















  public final class InputManager {













    method public android.view.InputDevice getInputDevice(int);













    method @Nullable public android.view.InputDevice getInputDevice(int);















    method public int[] getInputDeviceIds();















    method @FloatRange(from=0, to=1) public float getMaximumObscuringOpacityForTouch();















    method public void registerInputDeviceListener(android.hardware.input.InputManager.InputDeviceListener, android.os.Handler);










@@ -48166,7 +48166,7 @@ package android.view {













    method @NonNull public android.hardware.BatteryState getBatteryState();















    method public int getControllerNumber();















    method public String getDescriptor();













    method public static android.view.InputDevice getDevice(int);













    method @Nullable public static android.view.InputDevice getDevice(int);















    method public static int[] getDeviceIds();















    method public int getId();















    method public android.view.KeyCharacterMap getKeyCharacterMap();

























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



+1
−0




























Original line number
Diff line number
Diff line








@@ -346,6 +346,7 @@ public final class InputManager {













     * @param id The device id.















     * @return The input device or null if not found.















     */













    @Nullable















    public InputDevice getInputDevice(int id) {















        synchronized (mInputDevicesLock) {















            populateInputDevicesLocked();

































core/java/android/view/InputDevice.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.view;





























import android.annotation.IntDef;















import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.RequiresPermission;















import android.annotation.TestApi;















import android.compat.annotation.UnsupportedAppUsage;










@@ -517,6 +518,7 @@ public final class InputDevice implements Parcelable {













     * @param id The device id.















     * @return The input device or null if not found.















     */













    @Nullable















    public static InputDevice getDevice(int id) {















        return InputManager.getInstance().getInputDevice(id);















    }