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

Commit 7211d2eb authored Jan 27, 2017 by Andrii Kulian

Rename flag that enables showing display content with keyguard

Renamed SHOW_WITH_INSECURE_LOCKSCREEN to CAN_SHOW_WITH_INSECURE_KEYGUARD.

Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: Ie03ee59730a9e9e715b2bad0a14fdd107b8c7c00

parent 977b106d

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -15247,7 +15247,7 @@ package android.hardware.display {
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -42577,7 +42577,7 @@ package android.view {
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 32; // 0x20
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -15824,7 +15824,7 @@ package android.hardware.display {
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -45979,7 +45979,7 @@ package android.view {
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 32; // 0x20
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -15281,7 +15281,7 @@ package android.hardware.display {
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -42881,7 +42881,7 @@ package android.view {
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 32; // 0x20
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ public final class DisplayManager {
		*
		* @see #createVirtualDisplay
		*/
		public static final int VIRTUAL_DISPLAY_FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 1 << 5;
		public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 1 << 5;

		/** @hide */
		public DisplayManager(Context context) {

core/java/android/view/Display.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@ public final class Display {
		*
		* @see #getFlags
		*/
		public static final int FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 1 << 5;
		public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 1 << 5;

		/**
		* Display flag: Indicates that the contents of the display should not be scaled