diff options
| author | Brett Chabot <brettchabot@google.com> | 2020-03-23 22:36:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-23 22:36:06 +0000 |
| commit | 684df150bb20ce3dd9d89fdabf9b0b74c7ef4e18 (patch) | |
| tree | 718e0117d71c7ba284ae0aecfefb9a3000ddc6e0 | |
| parent | 8e093a492f8364c76bd934a230405642b46cf284 (diff) | |
| parent | 2e55a5615cda5d300d6c161ec842a850797506ce (diff) | |
| download | platform_external_robolectric-shadows-684df150bb20ce3dd9d89fdabf9b0b74c7ef4e18.tar.gz platform_external_robolectric-shadows-684df150bb20ce3dd9d89fdabf9b0b74c7ef4e18.tar.bz2 platform_external_robolectric-shadows-684df150bb20ce3dd9d89fdabf9b0b74c7ef4e18.zip | |
Adjust to androidx.test ActivityInvoker API change. am: 2e55a5615c
Change-Id: Idec7ce2ca8df53a045fd508c0825ee71569c303a
| -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 { |