Merge "Plumb display connection type to DMS" (b26dbebc) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public final class DisplayManager {
		* Display category: Presentation displays.
		* <p>
		* This category can be used to identify secondary displays that are suitable for
		* use as presentation displays such as HDMI or Wireless displays. Applications
		* use as presentation displays such as external or wireless displays. Applications
		* may automatically project their content to presentation displays to provide
		* richer second screen experiences.
		* </p>
		@@ -100,7 +100,7 @@ public final class DisplayManager {
		* When this flag is set, the virtual display is public.
		* </p><p>
		* A public virtual display behaves just like most any other display that is connected
		* to the system such as an HDMI or Wireless display. Applications can open
		* to the system such as an external or wireless display. Applications can open
		* windows on the display and the system may mirror the contents of other displays
		* onto it.
		* </p><p>
		@@ -364,7 +364,7 @@ public final class DisplayManager {
		addAllDisplaysLocked(mTempDisplays, displayIds);
		} else if (category.equals(DISPLAY_CATEGORY_PRESENTATION)) {
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_WIFI);
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_HDMI);
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_EXTERNAL);
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_OVERLAY);
		addPresentationDisplaysLocked(mTempDisplays, displayIds, Display.TYPE_VIRTUAL);
		}

core/java/android/view/Display.java

+13 −14

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ import java.util.List;
		* </ul>
		* </p><p>
		* A logical display does not necessarily represent a particular physical display device
		* such as the built-in screen or an external monitor. The contents of a logical
		* such as the internal display or an external display. The contents of a logical
		* display may be presented on one or more physical displays according to the devices
		* that are currently attached and whether mirroring has been enabled.
		* </p>
		@@ -104,8 +104,7 @@ public final class Display {
		private int mCachedAppHeightCompat;

		/**
		* The default Display id, which is the id of the built-in primary display
		* assuming there is one.
		* The default Display id, which is the id of the primary display assuming there is one.
		*/
		public static final int DEFAULT_DISPLAY = 0;

		@@ -188,7 +187,7 @@ public final class Display {
		* Display flag: Indicates that the display is a presentation display.
		* <p>
		* This flag identifies secondary displays that are suitable for
		* use as presentation displays such as HDMI or Wireless displays. Applications
		* use as presentation displays such as external or wireless displays. Applications
		* may automatically project their content to presentation displays to provide
		* richer second screen experiences.
		* </p>
		@@ -257,17 +256,17 @@ public final class Display {
		public static final int TYPE_UNKNOWN = 0;

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

		/**
		* Display type: HDMI display.
		* Display type: Physical display connected through an external port.
		* @hide
		*/
		@UnsupportedAppUsage
		public static final int TYPE_HDMI = 2;
		public static final int TYPE_EXTERNAL = 2;

		/**
		* Display type: WiFi display.
		@@ -562,8 +561,8 @@ public final class Display {
		* @return The display type.
		*
		* @see #TYPE_UNKNOWN
		* @see #TYPE_BUILT_IN
		* @see #TYPE_HDMI
		* @see #TYPE_INTERNAL
		* @see #TYPE_EXTERNAL
		* @see #TYPE_WIFI
		* @see #TYPE_OVERLAY
		* @see #TYPE_VIRTUAL
		@@ -1251,10 +1250,10 @@ public final class Display {
		switch (type) {
		case TYPE_UNKNOWN:
		return "UNKNOWN";
		case TYPE_BUILT_IN:
		return "BUILT_IN";
		case TYPE_HDMI:
		return "HDMI";
		case TYPE_INTERNAL:
		return "INTERNAL";
		case TYPE_EXTERNAL:
		return "EXTERNAL";
		case TYPE_WIFI:
		return "WIFI";
		case TYPE_OVERLAY:

core/java/android/view/SurfaceControl.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -1285,12 +1285,15 @@ public final class SurfaceControl implements Parcelable {
		* @hide
		*/
		public static final class DisplayInfo {
		public boolean isInternal;
		public float density;
		public boolean secure;

		@Override
		public String toString() {
		return "DisplayInfo{density=" + density + ", secure=" + secure + "}";
		return "DisplayInfo{isInternal=" + isInternal
		+ ", density=" + density
		+ ", secure=" + secure + "}";
		}
		}

core/jni/android_view_SurfaceControl.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ static const char* const OutOfResourcesException =
		static struct {
		jclass clazz;
		jmethodID ctor;
		jfieldID isInternal;
		jfieldID density;
		jfieldID secure;
		} gDisplayInfoClassInfo;
		@@ -781,6 +782,8 @@ static jobject nativeGetDisplayInfo(JNIEnv* env, jclass clazz, jobject tokenObj)
		}

		jobject object = env->NewObject(gDisplayInfoClassInfo.clazz, gDisplayInfoClassInfo.ctor);
		env->SetBooleanField(object, gDisplayInfoClassInfo.isInternal,
		info.connectionType == DisplayConnectionType::Internal);
		env->SetFloatField(object, gDisplayInfoClassInfo.density, info.density);
		env->SetBooleanField(object, gDisplayInfoClassInfo.secure, info.secure);
		return object;
		@@ -1528,6 +1531,7 @@ int register_android_view_SurfaceControl(JNIEnv* env)
		jclass infoClazz = FindClassOrDie(env, "android/view/SurfaceControl$DisplayInfo");
		gDisplayInfoClassInfo.clazz = MakeGlobalRefOrDie(env, infoClazz);
		gDisplayInfoClassInfo.ctor = GetMethodIDOrDie(env, infoClazz, "<init>", "()V");
		gDisplayInfoClassInfo.isInternal = GetFieldIDOrDie(env, infoClazz, "isInternal", "Z");
		gDisplayInfoClassInfo.density = GetFieldIDOrDie(env, infoClazz, "density", "F");
		gDisplayInfoClassInfo.secure = GetFieldIDOrDie(env, infoClazz, "secure", "Z");

services/core/java/com/android/server/display/DisplayManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
		* The display manager service relies on a collection of {@link DisplayAdapter} components,
		* for discovering and configuring physical display devices attached to the system.
		* There are separate display adapters for each manner that devices are attached:
		* one display adapter for built-in local displays, one for simulated non-functional
		* one display adapter for physical displays, one for simulated non-functional
		* displays when the system is headless, one for simulated overlay displays used for
		* development, one for wifi displays, etc.
		* </p><p>
		@@ -231,7 +231,7 @@ public final class DisplayManagerService extends SystemService {
		private int mGlobalDisplayState = Display.STATE_ON;

		// The overall display brightness.
		// For now, this only applies to the built-in display but we may split it up eventually.
		// For now, this only applies to the default display but we may split it up eventually.
		private float mGlobalDisplayBrightness;

		// Set to true when there are pending display changes that have yet to be applied