diff options
| author | Kevin Liu <congxiliu@google.com> | 2023-06-28 03:25:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-28 03:25:07 +0000 |
| commit | 8c07b36491e4b3adc21353a55424e216c9a58be3 (patch) | |
| tree | 9e0754724a0d3c3ab87e31d394859a0f991e1787 | |
| parent | bcf8a5417d3121654286f0b5f9a77aca7e460d26 (diff) | |
| parent | e71234e1fa14961c61343da6675d67d40cfc6d49 (diff) | |
| download | robolectric-8c07b36491e4b3adc21353a55424e216c9a58be3.tar.gz | |
Address TODO in b/288311989 am: e71234e1fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric/+/23794647
Change-Id: I3932d4c56ea20bb749143837895bae237ce41ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java b/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java index cf7646559..ed859dd23 100644 --- a/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java +++ b/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java @@ -722,10 +722,13 @@ public class AndroidTestEnvironment implements TestEnvironment { for (String action : receiver.getActions()) { filter.addAction(action); } - // TODO(b/288311989); The newBroadcastReceiverFromP will break ClockworkSystemUIRoboTests - // during "instantiateReceiver". - // Temporarily block invocation of "newBroadcastReceiverFromP" till it's resolved. - application.registerReceiver((BroadcastReceiver) newInstanceOf(receiver.getName()), filter); + String receiverClassName = receiver.getName(); + if (loadedApk != null && RuntimeEnvironment.getApiLevel() >= P) { + application.registerReceiver( + newBroadcastReceiverFromP(receiverClassName, loadedApk), filter); + } else { + application.registerReceiver((BroadcastReceiver) newInstanceOf(receiverClassName), filter); + } } } |