Merge "Make InputDevice getAssociatedDisplayId part of the test API" into main

This commit is contained in:
Josep del Río
2023-07-27 06:50:01 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 0 deletions

View File

@@ -3526,6 +3526,7 @@ package android.view {
public final class InputDevice implements android.os.Parcelable {
method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void disable();
method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void enable();
method public int getAssociatedDisplayId();
method @NonNull public android.hardware.input.InputDeviceIdentifier getIdentifier();
method @Nullable public String getKeyboardLanguageTag();
method @Nullable public String getKeyboardLayoutType();

View File

@@ -1319,6 +1319,7 @@ public final class InputDevice implements Parcelable {
}
/** @hide */
@TestApi
public int getAssociatedDisplayId() {
return mAssociatedDisplayId;
}