diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-08-28 19:33:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 19:33:08 +0000 |
| commit | 2db754ac6e2cddf01801c450bb8200b01cddf410 (patch) | |
| tree | c6e5685f8032aca105e6ab076ba7f2113ea15c02 /tests | |
| parent | 8bd5d6900827c465f0770290776ec52753dc9622 (diff) | |
| parent | d7c9289f935992f4ae2fc032747f9e04bb86a7d0 (diff) | |
| download | frameworks_base-2db754ac6e2cddf01801c450bb8200b01cddf410.zip frameworks_base-2db754ac6e2cddf01801c450bb8200b01cddf410.tar.gz frameworks_base-2db754ac6e2cddf01801c450bb8200b01cddf410.tar.bz2 | |
Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java index ea0db56..e03b9c8 100644 --- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java +++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java @@ -366,15 +366,11 @@ public class ActivityTestMain extends Activity { if (recent.id >= 0) { // Stack on top. intent.putExtra(DocActivity.LABEL, "Stacked"); - task.startActivity(ActivityTestMain.this, intent, null); } else { // Start root activity. - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT - | Intent.FLAG_ACTIVITY_MULTIPLE_TASK - | Intent.FLAG_ACTIVITY_RETAIN_IN_RECENTS); intent.putExtra(DocActivity.LABEL, "New Root"); - task.startActivity(ActivityTestMain.this, intent, null); } + task.startActivity(ActivityTestMain.this, intent, null); } return true; } |