Merge "Ensure total runtime for time-limited FGS is in uptime base." into main (e4749a7f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ServiceRecord.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -683,6 +683,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
		private long mLastFgsStartTime;
		@UptimeMillisLong
		private long mTimeLimitExceededAt = Long.MIN_VALUE;
		@UptimeMillisLong
		private long mTotalRuntime = 0;

		TimeLimitedFgsInfo(@UptimeMillisLong long startTime) {
		@@ -705,9 +706,10 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
		}

		public void updateTotalRuntime() {
		mTotalRuntime += SystemClock.elapsedRealtime() - mLastFgsStartTime;
		mTotalRuntime += SystemClock.uptimeMillis() - mLastFgsStartTime;
		}

		@UptimeMillisLong
		public long getTotalRuntime() {
		return mTotalRuntime;
		}