From 5e545daa0a37ac642785189e44bb094f70e003b5 Mon Sep 17 00:00:00 2001 From: AndroidX Test Team Date: Wed, 14 Jan 2026 06:21:15 -0800 Subject: [PATCH] Add callActivityOnCreate method with PersistableBundle PiperOrigin-RevId: 856183820 --- runner/monitor/CHANGELOG.md | 3 +++ .../androidx/test/runner/MonitoringInstrumentation.java | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/runner/monitor/CHANGELOG.md b/runner/monitor/CHANGELOG.md index 60187df49..7ff1d441c 100644 --- a/runner/monitor/CHANGELOG.md +++ b/runner/monitor/CHANGELOG.md @@ -9,6 +9,9 @@ * Fixes missing IntentMonitor for startActivity with user overload. Now it's possible to intercept intents started with startActivityAsUser. +* Adds missing override of an existing callActivityOnCreate method with + PersistableBundle. + **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 9164a80b0..c7814fee0 100644 --- a/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java +++ b/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java @@ -32,6 +32,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.MessageQueue.IdleHandler; +import android.os.PersistableBundle; import android.os.UserHandle; import android.util.Log; import androidx.annotation.Nullable; @@ -733,6 +734,14 @@ public void callActivityOnCreate(Activity activity, Bundle bundle) { lifecycleMonitor.signalLifecycleChange(Stage.CREATED, activity); } + @Override + public void callActivityOnCreate( + Activity activity, Bundle bundle, PersistableBundle persistentState) { + lifecycleMonitor.signalLifecycleChange(Stage.PRE_ON_CREATE, activity); + super.callActivityOnCreate(activity, bundle, persistentState); + lifecycleMonitor.signalLifecycleChange(Stage.CREATED, activity); + } + // NOTE: we need to keep a count of activities between the start // and stop lifecycle internal to our instrumentation. Exiting the test // process with activities in this state can cause crashes/flakiness