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

Commit b57b9245 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Automerger Merge Worker
Browse files

Update javadoc for setLaunchDisplayId am: 334190f2 am: 9b95f61a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12794770

Change-Id: I22c51c6e4d6b748fbbe450f0e88e6eb93b88a656
parents 3a989863 9b95f61a

core/java/android/app/ActivityOptions.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -1284,10 +1284,10 @@ public class ActivityOptions { 
    }

    }





    /**

    /**

     * Sets the id of the display where activity should be launched.

     * Sets the id of the display where the activity should be launched.

     * An app can launch activities on public displays or private displays that are owned by the app

     * An app can launch activities on public displays or displays where the app already has

     * or where an app already has activities. Otherwise, trying to launch on a private display

     * activities. Otherwise, trying to launch on a private display or providing an invalid display

     * or providing an invalid display id will result in an exception.

     * id will result in an exception.

     * <p>

     * <p>

     * Setting launch display id will be ignored on devices that don't have

     * Setting launch display id will be ignored on devices that don't have

     * {@link android.content.pm.PackageManager#FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS}.

     * {@link android.content.pm.PackageManager#FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS}.