summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinu Deokaran <vinud@codeaurora.org>2015-07-07 12:38:57 -0400
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:27:57 -0600
commitee09840e54d8e2353931b8b348f3e4e6b77c2928 (patch)
treebeafa1a99054729dea69a1094e89e9d27ff5f699
parentf003a8b5590b76695a6f0414ad0038f41baeb8c1 (diff)
downloadframeworks_base-ee09840e54d8e2353931b8b348f3e4e6b77c2928.zip
frameworks_base-ee09840e54d8e2353931b8b348f3e4e6b77c2928.tar.gz
frameworks_base-ee09840e54d8e2353931b8b348f3e4e6b77c2928.tar.bz2
base: adding support for tertiary display
ES2 platform supports 3 built-in displays. Adding support for Tertiary display. Change-Id: Id8833fedbe1655e4ed8d11d25bb5b559fa46893d
-rw-r--r--core/java/android/view/SurfaceControl.java6
-rw-r--r--services/core/java/com/android/server/display/LocalDisplayAdapter.java1
2 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 5970c3f..051707e 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -215,6 +215,12 @@ public class SurfaceControl {
*/
public static final int BUILT_IN_DISPLAY_ID_HDMI = 1;
+ /**
+ * Built-in physical display id: Attached HDMI display.
+ * Use only with {@link SurfaceControl#getBuiltInDisplay(int)}.
+ */
+ public static final int BUILT_IN_DISPLAY_ID_TERTIARY = 2;
+
/* Display power modes * /
/**
diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
index 517a825..6d7af9d 100644
--- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java
+++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java
@@ -56,6 +56,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
private static final int[] BUILT_IN_DISPLAY_IDS_TO_SCAN = new int[] {
SurfaceControl.BUILT_IN_DISPLAY_ID_MAIN,
SurfaceControl.BUILT_IN_DISPLAY_ID_HDMI,
+ SurfaceControl.BUILT_IN_DISPLAY_ID_TERTIARY,
};
private final SparseArray<LocalDisplayDevice> mDevices =