diff options
| author | 2023-05-18 22:14:14 +0000 | |
|---|---|---|
| committer | 2023-05-18 22:28:48 +0000 | |
| commit | 0e44f031e5ac4d44b1288fd9fbe2bb97598e409b (patch) | |
| tree | 2821dbc762b998d36daf886ccacdf5aa8d11479f | |
| parent | 23e277322462b02b898424be2fb1bf2d78e95412 (diff) | |
Updating to go back to repeated
Test: Unit testing
Bug: 263304156
Change-Id: I8b5526c359c7c7eb5c901696956e5ab1a426bebe
| -rw-r--r-- | services/core/java/com/android/server/am/ActiveServices.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 0da25be8c8cc..31d60f25ef24 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -8297,8 +8297,8 @@ public final class ActiveServices { r.mFgsDelegation != null ? r.mFgsDelegation.mOptions.mDelegationService : ForegroundServiceDelegationOptions.DELEGATION_SERVICE_DEFAULT, 0 /* api_sate */, - 0 /* api_type */, - 0 /* api_timestamp */, + null /* api_type */, + null /* api_timestamp */, mAm.getUidStateLocked(r.appInfo.uid), mAm.getUidProcessCapabilityLocked(r.appInfo.uid), mAm.getUidStateLocked(r.mRecentCallingUid), diff --git a/services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java b/services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java index daa4ba4f1e16..9b3f24933f02 100644 --- a/services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java +++ b/services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java @@ -451,6 +451,10 @@ public class ForegroundServiceTypeLoggerModule { @ForegroundServiceApiType int apiType, long timestamp) { final long apiDurationBeforeFgsStart = r.mFgsEnterTime - timestamp; final long apiDurationAfterFgsEnd = timestamp - r.mFgsExitTime; + final int[] apiTypes = new int[1]; + apiTypes[0] = apiType; + final long[] timeStamps = new long[1]; + timeStamps[0] = timestamp; FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, r.shortInstanceName, @@ -475,8 +479,8 @@ public class ForegroundServiceTypeLoggerModule { r.mFgsDelegation != null ? r.mFgsDelegation.mOptions.mDelegationService : ForegroundServiceDelegationOptions.DELEGATION_SERVICE_DEFAULT, apiState, - apiType, - timestamp, + apiTypes, + timeStamps, ActivityManager.PROCESS_STATE_UNKNOWN, ActivityManager.PROCESS_CAPABILITY_NONE, ActivityManager.PROCESS_STATE_UNKNOWN, @@ -500,6 +504,10 @@ public class ForegroundServiceTypeLoggerModule { apiDurationAfterFgsEnd = timestamp - uidState.mLastFgsTimeStamp.get(apiType); } } + final int[] apiTypes = new int[1]; + apiTypes[0] = apiType; + final long[] timeStamps = new long[1]; + timeStamps[0] = timestamp; FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, uid, null, @@ -522,8 +530,8 @@ public class ForegroundServiceTypeLoggerModule { 0, 0, apiState, - apiType, - timestamp, + apiTypes, + timeStamps, ActivityManager.PROCESS_STATE_UNKNOWN, ActivityManager.PROCESS_CAPABILITY_NONE, ActivityManager.PROCESS_STATE_UNKNOWN, |