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

Commit 79d2d59d authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Mark some virtual display flags as TestApi"

parents d21cb60c f3afe5a5

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1305,6 +1305,8 @@ package android.hardware.display { 
    method public android.graphics.Point getStableDisplaySize();

    method public boolean isMinimalPostProcessingRequested(int);

    method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration);

    field public static final int VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS = 512; // 0x200

    field public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1024; // 0x400

  }



}

core/java/android/hardware/display/DisplayManager.java

+2 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ public final class DisplayManager { 
     * @hide

     */

    // TODO (b/114338689): Remove the flag and use IWindowManager#setShouldShowSystemDecors

    @TestApi

    public static final int VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS = 1 << 9;



    /**
@@ -320,6 +321,7 @@ public final class DisplayManager { 
     * @see #VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS

     * @hide

     */

    @TestApi

    public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1 << 10;



    /** @hide */