aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2018-03-01 18:37:30 -0800
committerAdam Lesinski <adamlesinski@google.com>2018-03-01 18:37:30 -0800
commit64e0f0bd21a2fc4ed585b4ecae3e868a43b1c5cc (patch)
tree191c8ede468a8c75300aed81ca4d4844d0a02a02
parent475039d8854e5bdb0968a736063b8908435c343c (diff)
downloadrobolectric-shadows-64e0f0bd21a2fc4ed585b4ecae3e868a43b1c5cc.tar.gz
Update Activity related reflection call
A method being called via reflection received a new parameter. Update the code accordingly. Activity#performStop(boolean) -> Activity#performStop(boolean, String) Test: make Run_all_robolectric_tests Change-Id: I8edb905485b7805a0fdb493803dc4ec3dcc492fe
-rw-r--r--shadows/framework/src/main/java/org/robolectric/android/controller/ActivityController.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/android/controller/ActivityController.java b/shadows/framework/src/main/java/org/robolectric/android/controller/ActivityController.java
index 3982324b4..11b06abce 100644
--- a/shadows/framework/src/main/java/org/robolectric/android/controller/ActivityController.java
+++ b/shadows/framework/src/main/java/org/robolectric/android/controller/ActivityController.java
@@ -274,10 +274,16 @@ public class ActivityController<T extends Activity> extends ComponentController<
from(Bundle.class, outState));
if (RuntimeEnvironment.getApiLevel() <= M) {
ReflectionHelpers.callInstanceMethod(Activity.class, component, "performStop");
- } else {
+ } else if (RuntimeEnvironment.getApiLevel() <= O_MR1){
ReflectionHelpers.callInstanceMethod(
Activity.class, component, "performStop", from(boolean.class, true));
}
+ // BEGIN-INTERNAL
+ else {
+ ReflectionHelpers.callInstanceMethod(Activity.class, component, "performStop",
+ from(boolean.class, true), from(String.class, "configuration change"));
+ }
+ // END-INTERNAL
// This is the true and complete retained state, including loaders and retained
// fragments.