Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52c1f875 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make Display.Mode.isSynthetic TestApi" into main

parents 4a3ffa46 62fb8f94

core/api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -3676,6 +3676,7 @@ package android.view { 




  public static final class Display.Mode implements android.os.Parcelable {

  public static final class Display.Mode implements android.os.Parcelable {

    ctor public Display.Mode(int, int, float);

    ctor public Display.Mode(int, int, float);

    method public boolean isSynthetic();

    method public boolean matches(int, int, float);

    method public boolean matches(int, int, float);

  }

  }

core/java/android/view/Display.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -2344,6 +2344,8 @@ public final class Display { 
         * SurfaceControl.DisplayMode

         * SurfaceControl.DisplayMode

         * @hide

         * @hide

         */

         */

        @SuppressWarnings("UnflaggedApi") // For testing only

        @TestApi

        public boolean isSynthetic() {

        public boolean isSynthetic() {

            return mIsSynthetic;

            return mIsSynthetic;

        }

        }