From 8e4245030e014e906fb9c69ede511cfc0e584288 Mon Sep 17 00:00:00 2001 From: AndroidX Test Team Date: Wed, 25 Jun 2025 21:18:28 -0700 Subject: [PATCH] Add missing IntentMonitor for startActivity with user overload With the current code, any calls to startActivityAsUser will be missed by espresso-intent or similar intent monitoring facilities. PiperOrigin-RevId: 775965469 --- runner/monitor/CHANGELOG.md | 3 +++ .../androidx/test/runner/MonitoringInstrumentation.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/runner/monitor/CHANGELOG.md b/runner/monitor/CHANGELOG.md index 81697fb4a..7f878d05b 100644 --- a/runner/monitor/CHANGELOG.md +++ b/runner/monitor/CHANGELOG.md @@ -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** diff --git a/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java b/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java index 67954ce60..220180306 100644 --- a/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java +++ b/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java @@ -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); }