Merge "Update StartInfo onCreate timestamp to monotonic" into main
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 76c1ed6..b384326 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -7500,7 +7500,7 @@
+ data.instrumentationName + ": " + e.toString(), e);
}
try {
- timestampApplicationOnCreateNs = SystemClock.elapsedRealtimeNanos();
+ timestampApplicationOnCreateNs = SystemClock.uptimeNanos();
mInstrumentation.callApplicationOnCreate(app);
} catch (Exception e) {
timestampApplicationOnCreateNs = 0;