summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/api/test-current.txt1
-rw-r--r--core/java/android/view/InputDevice.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 050667b166bc..525f9ec793ef 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -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();
diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java
index 8b23f19f1067..f81dc5a58593 100644
--- a/core/java/android/view/InputDevice.java
+++ b/core/java/android/view/InputDevice.java
@@ -1319,6 +1319,7 @@ public final class InputDevice implements Parcelable {
}
/** @hide */
+ @TestApi
public int getAssociatedDisplayId() {
return mAssociatedDisplayId;
}