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

Commit aa412973 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev 

am: c66b6ff9

Change-Id: I1db901364853ceb5eaec1ac757fd6974db7ea2a9
parents 78302671 c66b6ff9

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -15745,7 +15745,6 @@ package android.hardware.display { 
    method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);

    field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";

    field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10

    field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20

    field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8

    field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2

    field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
@@ -43886,7 +43885,6 @@ package android.view { 
    method public boolean isValid();

    method public boolean isWideColorGamut();

    field public static final int DEFAULT_DISPLAY = 0; // 0x0

    field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20

    field public static final int FLAG_PRESENTATION = 8; // 0x8

    field public static final int FLAG_PRIVATE = 4; // 0x4

    field public static final int FLAG_ROUND = 16; // 0x10

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -16531,7 +16531,6 @@ package android.hardware.display { 
    method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);

    field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";

    field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10

    field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20

    field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8

    field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2

    field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
@@ -47452,7 +47451,6 @@ package android.view { 
    method public boolean isValid();

    method public boolean isWideColorGamut();

    field public static final int DEFAULT_DISPLAY = 0; // 0x0

    field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20

    field public static final int FLAG_PRESENTATION = 8; // 0x8

    field public static final int FLAG_PRIVATE = 4; // 0x4

    field public static final int FLAG_ROUND = 16; // 0x10

api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -15794,7 +15794,6 @@ package android.hardware.display { 
    method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);

    field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";

    field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10

    field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20

    field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8

    field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2

    field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
@@ -44265,7 +44264,6 @@ package android.view { 
    method public boolean isValid();

    method public boolean isWideColorGamut();

    field public static final int DEFAULT_DISPLAY = 0; // 0x0

    field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20

    field public static final int FLAG_PRESENTATION = 8; // 0x8

    field public static final int FLAG_PRIVATE = 4; // 0x4

    field public static final int FLAG_ROUND = 16; // 0x10

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

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ public final class DisplayManager { 
     * </p>

     *

     * @see #createVirtualDisplay

     * @hide

     */

    public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 1 << 5;

core/java/android/view/Display.java

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ public final class Display { 
     * </p>

     *

     * @see #getFlags

     * @hide

     */

    public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 1 << 5;