diff options
| author | Brett Chabot <brettchabot@google.com> | 2020-02-20 08:22:22 -0800 |
|---|---|---|
| committer | Dennis Meng <dennismeng@google.com> | 2020-03-23 13:49:04 -0700 |
| commit | 2e55a5615cda5d300d6c161ec842a850797506ce (patch) | |
| tree | 8342d65a6df5dd2b3ed1e918882ad1c9484fe86d | |
| parent | f4bf93d649353bedee4c448913e6fd8a7afae7a7 (diff) | |
| download | platform_external_robolectric-shadows-2e55a5615cda5d300d6c161ec842a850797506ce.tar.gz platform_external_robolectric-shadows-2e55a5615cda5d300d6c161ec842a850797506ce.tar.bz2 platform_external_robolectric-shadows-2e55a5615cda5d300d6c161ec842a850797506ce.zip | |
Adjust to androidx.test ActivityInvoker API change.
Test: m Robolectric_all
cherry pick from aosp/1240652
Bug: 152240886
Merged-In: I758d12639c924c9263e543103b39438e044c7cd5
Change-Id: Ie7a3123c93e4488e468b7165233643ec86ff33cf
| -rw-r--r-- | robolectric/src/main/java/org/robolectric/android/internal/LocalActivityInvoker.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/robolectric/src/main/java/org/robolectric/android/internal/LocalActivityInvoker.java b/robolectric/src/main/java/org/robolectric/android/internal/LocalActivityInvoker.java index 25b3692e8..a3119e021 100644 --- a/robolectric/src/main/java/org/robolectric/android/internal/LocalActivityInvoker.java +++ b/robolectric/src/main/java/org/robolectric/android/internal/LocalActivityInvoker.java @@ -30,6 +30,11 @@ public class LocalActivityInvoker implements ActivityInvoker { @Nullable private ActivityController<? extends Activity> controller; @Override + public void startActivity(Intent intent, @Nullable Bundle activityOptions) { + startActivity(intent); + } + + @Override public void startActivity(Intent intent) { ActivityInfo ai = intent.resolveActivityInfo(getTargetContext().getPackageManager(), 0); try { |