Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Activity's member Instrumentation in ActivityController #6860

Merged
merged 1 commit into from Nov 17, 2021
Merged

Use Activity's member Instrumentation in ActivityController #6860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions shadows/framework/src/main/java/org/robolectric/android/controller/ActivityController.java
View file
Open in desktop
Expand Up @@ -7,7 +7,6 @@
import static org.robolectric.util.reflector.Reflector.reflector;

import android.app.Activity;
import android.app.ActivityThread;
import android.app.Application;
import android.app.Instrumentation;
import android.content.ComponentName;
Expand Down Expand Up @@ -502,8 +501,9 @@ public ActivityController<T> recreate() {
}
}

private static Instrumentation getInstrumentation() {
return ((ActivityThread) RuntimeEnvironment.getActivityThread()).getInstrumentation();
// Get the Instrumentation object scoped to the Activity.
private Instrumentation getInstrumentation() {
return _component_.getInstrumentation();
}

/** Accessor interface for android.app.Activity.NonConfigurationInstances's internals. */
Expand Down
3 changes: 3 additions & 0 deletions shadows/framework/src/main/java/org/robolectric/shadows/_Activity_.java
View file
Open in desktop
Expand Up @@ -372,4 +372,7 @@ void setVoiceInteractor(

@Accessor("mConfigChangeFlags")
void setConfigChangeFlags(int value);

@Accessor("mInstrumentation")
Instrumentation getInstrumentation();
}