diff options
| author | Scott Main <smain@google.com> | 2013-10-16 13:57:46 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2013-10-16 14:08:07 -0700 |
| commit | cc2195bb560cc155bf3e7d3a7f27fe619a497124 (patch) | |
| tree | 992fcb2e7b08898110e8715ead53d002d7dd7781 | |
| parent | 1bab3f5306f0682eafd74d17517a90c0f4ac4d5c (diff) | |
| download | base-cc2195bb560cc155bf3e7d3a7f27fe619a497124.tar.gz | |
some javadoc improvements for virtual display and
new meta tag name
Change-Id: If9caba425f825652468a0f3e868f71ed1a778fb1
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 5 | ||||
| -rw-r--r-- | core/java/android/hardware/display/VirtualDisplay.java | 8 |
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 + * <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 <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 */ |