Merge "Add a flag for allowing always unlocked virtual displays" (fead4830) · Commits · e / os / android_frameworks_base

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -344,6 +344,16 @@ public final class DisplayManager {
		*/
		public static final int VIRTUAL_DISPLAY_FLAG_OWN_DISPLAY_GROUP = 1 << 11;

		/**
		* Virtual display flags: Indicates that the virtual display should always be unlocked and not
		* have keyguard displayed on it. Only valid for virtual displays that aren't in the default
		* display group.
		*
		* @see #createVirtualDisplay
		* @see #VIRTUAL_DISPLAY_FLAG_OWN_DISPLAY_GROUP
		* @hide
		*/
		public static final int VIRTUAL_DISPLAY_FLAG_ALWAYS_UNLOCKED = 1 << 12;

		/** @hide */
		@IntDef(prefix = {"MATCH_CONTENT_FRAMERATE_"}, value = {
		@@ -1363,5 +1373,13 @@ public final class DisplayManager {
		* @hide
		*/
		String KEY_HIGH_REFRESH_RATE_BLACKLIST = "high_refresh_rate_blacklist";

		/**
		* Whether to allow the creation of always unlocked virtual displays by apps having the
		* required permissions.
		* @hide
		*/
		String KEY_ALLOW_ALWAYS_UNLOCKED_VIRTUAL_DISPLAYS =
		"allow_always_unlocked_virtual_displays";
		}
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -298,6 +298,15 @@ public final class Display {
		*/
		public static final int FLAG_OWN_DISPLAY_GROUP = 1 << 8;

		/**
		* Flag: Indicates that the display should always be unlocked. Only valid on virtual displays
		* that aren't in the default display group.
		*
		* @hide
		* @see #getFlags()
		*/
		public static final int FLAG_ALWAYS_UNLOCKED = 1 << 9;

		/**
		* Display flag: Indicates that the contents of the display should not be scaled
		* to fit the physical screen dimensions. Used for development only to emulate

+3 −0

Original line number	Diff line number	Diff line
		@@ -863,6 +863,9 @@ public final class DisplayInfo implements Parcelable {
		if ((flags & Display.FLAG_OWN_DISPLAY_GROUP) != 0) {
		result.append(", FLAG_OWN_DISPLAY_GROUP");
		}
		if ((flags & Display.FLAG_ALWAYS_UNLOCKED) != 0) {
		result.append(", FLAG_ALWAYS_UNLOCKED");
		}
		return result.toString();
		}
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -5882,6 +5882,10 @@
		<permission android:name="android.permission.ADD_TRUSTED_DISPLAY"
		android:protectionLevel="signature" />

		<!-- Allows an application to create always-unlocked displays. @hide -->
		<permission android:name="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY"
		android:protectionLevel="signature"/>

		<!-- @hide @SystemApi Allows an application to access locusId events in the usage stats. -->
		<permission android:name="android.permission.ACCESS_LOCUS_ID_USAGE_STATS"
		android:protectionLevel="signature\|role" />

+9 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,15 @@ final class DisplayDeviceInfo {
		*/
		public static final int FLAG_OWN_DISPLAY_GROUP = 1 << 14;

		/**
		* Flag: Indicates that the display should always be unlocked. Only valid on virtual displays
		* that aren't in the default display group.
		* @see #FLAG_OWN_DISPLAY_GROUP
		* @hide
		*/
		public static final int FLAG_ALWAYS_UNLOCKED = 1 << 15;


		/**
		* Touch attachment: Display does not receive touch.
		*/