diff options
| author | Linus Tufvesson <lus@google.com> | 2020-10-09 21:15:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-09 21:15:15 +0000 |
| commit | 9b95f61aebb7b41833ce730ed7b8be4007ff3ab5 (patch) | |
| tree | 0c088becbdeb1f1a89980ddab455344575b8aa73 | |
| parent | ce72a1f884571091e7ea6c2f93ff06a286f0db07 (diff) | |
| parent | 334190f26e7bc1660ac0bbf9645b8e434a147062 (diff) | |
| download | base-9b95f61aebb7b41833ce730ed7b8be4007ff3ab5.tar.gz | |
Update javadoc for setLaunchDisplayId am: 334190f26e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12794770
Change-Id: If6e12055adfbe330ef00f36d661aaccd64bfded4
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 80d2e6c60f69..4aedfeefb72b 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1275,10 +1275,10 @@ public class ActivityOptions { } /** - * Sets the id of the display where activity should be launched. - * An app can launch activities on public displays or private displays that are owned by the app - * or where an app already has activities. Otherwise, trying to launch on a private display - * or providing an invalid display id will result in an exception. + * Sets the id of the display where the activity should be launched. + * An app can launch activities on public displays or displays where the app already has + * activities. Otherwise, trying to launch on a private display or providing an invalid display + * id will result in an exception. * <p> * Setting launch display id will be ignored on devices that don't have * {@link android.content.pm.PackageManager#FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS}. |