summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2020-10-09 21:42:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-09 21:42:16 +0000
commit14c9e482735e535253ade5f032c50e6a8c9495d5 (patch)
treed690abf5dadb041abb8970a2749923aa21454086
parentd00160c0af5c9be036cee9a330872a085f4477a5 (diff)
parentc37e1022501e51b0c92323d5c7f348a9d68b7dec (diff)
Update javadoc for setLaunchDisplayId am: 334190f26e am: c37e102250
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12794770 Change-Id: I57cce60a4f3c34b00f2c215e49cde51b0daf11bd
-rw-r--r--core/java/android/app/ActivityOptions.java8
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}.