Merge "Expose Display.getType() via TestApi." into rvc-dev (bd745f76) · Commits · e / os / android_frameworks_base

api/test-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -4814,7 +4814,14 @@ package android.view {

		public final class Display {
		method @NonNull public android.graphics.ColorSpace[] getSupportedWideColorGamut();
		method public int getType();
		method public boolean hasAccess(int);
		field public static final int TYPE_EXTERNAL = 2; // 0x2
		field public static final int TYPE_INTERNAL = 1; // 0x1
		field public static final int TYPE_OVERLAY = 4; // 0x4
		field public static final int TYPE_UNKNOWN = 0; // 0x0
		field public static final int TYPE_VIRTUAL = 5; // 0x5
		field public static final int TYPE_WIFI = 3; // 0x3
		}

		public class FocusFinder {

+7 −0

Original line number	Diff line number	Diff line
		@@ -253,12 +253,14 @@ public final class Display {
		* @hide
		*/
		@UnsupportedAppUsage
		@TestApi
		public static final int TYPE_UNKNOWN = 0;

		/**
		* Display type: Physical display connected through an internal port.
		* @hide
		*/
		@TestApi
		public static final int TYPE_INTERNAL = 1;

		/**
		@@ -266,6 +268,7 @@ public final class Display {
		* @hide
		*/
		@UnsupportedAppUsage
		@TestApi
		public static final int TYPE_EXTERNAL = 2;

		/**
		@@ -273,12 +276,14 @@ public final class Display {
		* @hide
		*/
		@UnsupportedAppUsage
		@TestApi
		public static final int TYPE_WIFI = 3;

		/**
		* Display type: Overlay display.
		* @hide
		*/
		@TestApi
		public static final int TYPE_OVERLAY = 4;

		/**
		@@ -286,6 +291,7 @@ public final class Display {
		* @hide
		*/
		@UnsupportedAppUsage
		@TestApi
		public static final int TYPE_VIRTUAL = 5;

		/**
		@@ -569,6 +575,7 @@ public final class Display {
		* @hide
		*/
		@UnsupportedAppUsage
		@TestApi
		public int getType() {
		return mType;
		}