summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/app/ActivityManager.java5
-rw-r--r--core/java/android/hardware/display/VirtualDisplay.java8
2 files changed, 10 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 1067eb1b2add..bb04063905d5 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -68,9 +68,10 @@ public class ActivityManager {
private final Handler mHandler;
/**
- * <meta-data> string for a 'home' Activity that names a package that is to be
+ * <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code
+ * &lt;meta-data>}</a> name for a 'home' Activity that declares a package that is to be
* uninstalled in lieu of the declaring one. The package named here must be
- * signed with the same certificate as the one declaring the <meta-data>.
+ * signed with the same certificate as the one declaring the {@code &lt;meta-data>}.
*/
public static final String META_HOME_ALTERNATE = "android.app.home.alternate";
diff --git a/core/java/android/hardware/display/VirtualDisplay.java b/core/java/android/hardware/display/VirtualDisplay.java
index 908aadd5a314..01e5bac01d85 100644
--- a/core/java/android/hardware/display/VirtualDisplay.java
+++ b/core/java/android/hardware/display/VirtualDisplay.java
@@ -19,7 +19,13 @@ import android.os.IBinder;
import android.view.Display;
/**
- * Represents a virtual display.
+ * Represents a virtual display. The content of a virtual display is rendered to a
+ * {@link android.view.Surface} that you must provide to {@link DisplayManager#createVirtualDisplay
+ * createVirtualDisplay()}.
+ * <p>Because a virtual display renders to a surface provided by the application, it will be
+ * released automatically when the process terminates and all remaining windows on it will
+ * be forcibly removed. However, you should also explicitly call {@link #release} when you're
+ * done with it.
*
* @see DisplayManager#createVirtualDisplay
*/