Skip to content

Add missing IntentMonitor for startActivity with user overload #2405

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

Merged
copybara-service merged 1 commit into from
Jul 3, 2025
Merged

Add missing IntentMonitor for startActivity with user overload #2405

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions runner/monitor/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

**Bug Fixes**

* Fixes missing IntentMonitor for startActivity with user overload. Now it's
possible to intercept intents started with startActivityAsUser.

**New Features**

**Breaking Changes**
Expand Down
6 changes: 6 additions & 0 deletions runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,12 @@ public ActivityResult execStartActivity(
int requestCode,
Bundle options,
UserHandle user) {
intentMonitor.signalIntent(intent);
ActivityResult ar = stubResultFor(intent);
if (ar != null) {
Log.i(TAG, String.format("Stubbing intent %s", intent));
return ar;
}
return super.execStartActivity(
who, contextThread, token, target, intent, requestCode, options, user);
}
Expand Down
Loading