summaryrefslogtreecommitdiff
path: root/core/java/android/app/TaskStackBuilder.java
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2018-01-24 08:35:28 -0800
committerSelim Cinek <cinek@google.com>2018-01-24 23:30:01 +0000
commit7fa385abd882b8381e928d107bc81d984a8bbee4 (patch)
treeeea731f0d111b0d8e8e398f77f86f8c46da820e8 /core/java/android/app/TaskStackBuilder.java
parent2627d72e61ff68b237d243e2b10ab85eb8dd6edf (diff)
Launching notification settings correctly inline
Previously, the panel would still collapse when launching the notification settings. We're now looking at the newly returned result of the activity launch instead to determine if we should collapse. Bug: 69168591 Test: launch settings activity from notification guts, observe no collapsing Change-Id: I414e7f4a9fd22d4f0b46437bfdb94e5c0f6cce58
Diffstat (limited to 'core/java/android/app/TaskStackBuilder.java')
-rw-r--r--core/java/android/app/TaskStackBuilder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/TaskStackBuilder.java b/core/java/android/app/TaskStackBuilder.java
index bab993f855e9..ab5974777c9e 100644
--- a/core/java/android/app/TaskStackBuilder.java
+++ b/core/java/android/app/TaskStackBuilder.java
@@ -213,13 +213,13 @@ public class TaskStackBuilder {
* Start the task stack constructed by this builder.
* @hide
*/
- public void startActivities(Bundle options, UserHandle userHandle) {
+ public int startActivities(Bundle options, UserHandle userHandle) {
if (mIntents.isEmpty()) {
throw new IllegalStateException(
"No intents added to TaskStackBuilder; cannot startActivities");
}
- mSourceContext.startActivitiesAsUser(getIntents(), options, userHandle);
+ return mSourceContext.startActivitiesAsUser(getIntents(), options, userHandle);
}
/**