diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-11-06 06:39:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-06 06:39:21 +0000 |
| commit | a46b9ca0831cf172444fd231ca04be6643bf9f4e (patch) | |
| tree | f1e8c27f59521822efeb427dc6bdefc23c9f53ff /core/java/android | |
| parent | 4bf760b152b3aebc536626eb53cc68e516669eab (diff) | |
| parent | 3c1e53ddaacf6cf0372c792fdac5287d70a3da57 (diff) | |
Merge "Use setTaskOverlay to launch ConfirmDeviceCredentialActivity."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 67728840ada8..f91453ea0811 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1301,8 +1301,8 @@ public class ActivityOptions { /** * Set's whether the activity launched with this option should be a task overlay. That is the - * activity will always be the top activity of the task. If {@param canResume} is true, then - * the task will also not be moved to the front of the stack. + * activity will always be the top activity of the task. + * @param canResume {@code false} if the task will also not be moved to the front of the stack. * @hide */ @TestApi |