summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-04-07 16:41:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-07 16:41:47 +0000
commitbd745f763aae2e6f49343391349da7fc4bdeded0 (patch)
tree997809becb9c80193501da8f6290f810df01ee0f /core/java
parentf7ef70e669397b8a1826bc12bdd9bd0ff72fe041 (diff)
parent29d5b8f43eec2b5d2d9c906ebb81107dd603be62 (diff)
Merge "Expose Display.getType() via TestApi." into rvc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/Display.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index 0ccb1e055c46..4469fdbb12ec 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -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;
}