diff options
| author | 2024-08-27 17:49:14 +0000 | |
|---|---|---|
| committer | 2024-08-27 17:49:14 +0000 | |
| commit | 4621375fc92aa1075c544940e7892ce8da65a93c (patch) | |
| tree | 2ca466e6dc5e46abc15360890d4c5e5b12933bef | |
| parent | 84fae06e84eca252c94ab332c52504b13c8ed5c2 (diff) | |
| parent | 493a723df2a3affb653732e0158ad1ac32e10931 (diff) | |
Merge "Make Display.Mode.isSynthetic TestApi" into aosp-main-future
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/view/Display.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index c2f960f85c73..79c4fb653542 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -3633,6 +3633,7 @@ package android.view { 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); } diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 15b0c13de524..1f7ed8be357c 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -2344,6 +2344,8 @@ public final class Display { * SurfaceControl.DisplayMode * @hide */ + @SuppressWarnings("UnflaggedApi") // For testing only + @TestApi public boolean isSynthetic() { return mIsSynthetic; } |