Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d66877b authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display... 

am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev

* commit '0763e156':
  some javadoc improvements for virtual display and new meta tag name
parents 25e7240e 0763e156

core/java/android/app/ActivityManager.java

+3 −2
Original line number Diff line number Diff line
@@ -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";

core/java/android/hardware/display/VirtualDisplay.java

+7 −1
Original line number Diff line number Diff line
@@ -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

 */