commit 5fa1e5939c9f4631bdfaaf2bf7ae4e208a5c12d1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 11 05:09:01 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 11 05:09:01 2023 +0000
tree 45e893cc008f029dd3dba7e599c2edc59c623e01
parent f3d87ba13794a486bb321a3e20486578eb6e2eca
parent f480aeddcd66b219a4455fa0c6aac078eb1d397b

Merge "Merge "[GWP-ASan] Ensure recoverable crashes show up in AppExitInfo." am: 0a52acbd6c am: 3598f43e8f am: f6915b7b17" into udc-dev

core/api/test-current.txt

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 9b5e31a..7d81a95 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -3429,8 +3429,14 @@
     method @NonNull public android.hardware.input.InputDeviceIdentifier getIdentifier();
   }
 
+  public abstract class InputEvent implements android.os.Parcelable {
+    method public abstract int getDisplayId();
+    method public abstract void setDisplayId(int);
+  }
+
   public class KeyEvent extends android.view.InputEvent implements android.os.Parcelable {
     method public static String actionToString(int);
+    method public final int getDisplayId();
     method public final void setDisplayId(int);
     field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800
     field public static final int LAST_KEYCODE = 316; // 0x13c

core/java/android/view/InputEvent.java

diff --git a/core/java/android/view/InputEvent.java b/core/java/android/view/InputEvent.java
index 0b4adae..a8e68b71 100644
--- a/core/java/android/view/InputEvent.java
+++ b/core/java/android/view/InputEvent.java
@@ -16,6 +16,7 @@
 
 package android.view;
 
+import android.annotation.TestApi;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -100,6 +101,7 @@
      * @return The display id associated with the event.
      * @hide
      */
+    @TestApi
     public abstract int getDisplayId();
 
     /**
@@ -107,6 +109,7 @@
      * @param displayId
      * @hide
      */
+    @TestApi
     public abstract void setDisplayId(int displayId);
     /**
      * Copies the event.

core/java/android/view/KeyEvent.java

diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index b6d9400..858da55 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -2100,6 +2100,7 @@
     }
 
     /** @hide */
+    @TestApi
     @Override
     public final int getDisplayId() {
         return mDisplayId;