commit 4848ffd83044e8364ff6837abb1f23674779319e
author Rachel Lee <rnlee@google.com> Thu Aug 29 19:53:05 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 29 19:53:05 2024 +0000
tree 49e4cd5adb85ed922dbb0ebe60d7068c2b325d0f
parent 306dc39d62c16bce7284d5138622c01b2139f874
parent 3079ba953c3b1d219406c9f8c29bc7fb51d444c2

Merge "Make Display.Mode.isSynthetic TestApi" into aosp-24Q3-ts-dev

core/api/test-current.txt

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index c2f960f..79c4fb6 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -3633,6 +3633,7 @@
 
   public static final class Display.Mode implements android.os.Parcelable {
     ctor public Display.Mode(int, int, float);
+    method public boolean isSynthetic();
     method public boolean matches(int, int, float);
   }
 

core/java/android/view/Display.java

diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index 15b0c13..1f7ed8b 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -2344,6 +2344,8 @@
          * SurfaceControl.DisplayMode
          * @hide
          */
+        @SuppressWarnings("UnflaggedApi") // For testing only
+        @TestApi
         public boolean isSynthetic() {
             return mIsSynthetic;
         }