Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updating API duration logging to use correct fields." into udc-dev am: 7515404afb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23482441

Change-Id: If52e19ed42f539534397e8a585d4241bf29dae7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kunal Malhotra
2023-06-01 22:19:27 +00:00
committed by Automerger Merge Worker
parent 011fcab514 7515404afb
commit a97dcde703
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/am/ForegroundServiceTypeLoggerModule.java
View File

@@ -113,6 +113,11 @@ public class ForegroundServiceTypeLoggerModule {
// We use this to get the duration an API was active after // We use this to get the duration an API was active after
// the stop call. // the stop call.
final SparseArray<Long> mLastFgsTimeStamp = new SparseArray<>(); final SparseArray<Long> mLastFgsTimeStamp = new SparseArray<>();
// A map of API types to first FGS start call timestamps
// We use this to get the duration an API was active after
// the stop call.
final SparseArray<Long> mFirstFgsTimeStamp = new SparseArray<>();
} }
// SparseArray that tracks all UIDs that have made various // SparseArray that tracks all UIDs that have made various
@@ -146,6 +151,7 @@ public class ForegroundServiceTypeLoggerModule {
if (fgsIndex < 0) { if (fgsIndex < 0) {
uidState.mRunningFgs.put(apiType, new ArrayMap<>()); uidState.mRunningFgs.put(apiType, new ArrayMap<>());
fgsIndex = uidState.mRunningFgs.indexOfKey(apiType); fgsIndex = uidState.mRunningFgs.indexOfKey(apiType);
uidState.mFirstFgsTimeStamp.put(apiType, System.currentTimeMillis());
} }
final ArrayMap<ComponentName, ServiceRecord> fgsList = final ArrayMap<ComponentName, ServiceRecord> fgsList =
uidState.mRunningFgs.valueAt(fgsIndex); uidState.mRunningFgs.valueAt(fgsIndex);
@@ -237,7 +243,7 @@ public class ForegroundServiceTypeLoggerModule {
// there's no more FGS running for this type, just get rid of it // there's no more FGS running for this type, just get rid of it
uidState.mRunningFgs.remove(apiType); uidState.mRunningFgs.remove(apiType);
// but we need to keep track of the timestamp in case an API stops // but we need to keep track of the timestamp in case an API stops
uidState.mLastFgsTimeStamp.put(apiType, record.mFgsExitTime); uidState.mLastFgsTimeStamp.put(apiType, System.currentTimeMillis());
} }
} }
if (!apisFound.isEmpty()) { if (!apisFound.isEmpty()) {
@@ -454,8 +460,17 @@ public class ForegroundServiceTypeLoggerModule {
public void logFgsApiEvent(ServiceRecord r, int fgsState, public void logFgsApiEvent(ServiceRecord r, int fgsState,
@FgsApiState int apiState, @FgsApiState int apiState,
@ForegroundServiceApiType int apiType, long timestamp) { @ForegroundServiceApiType int apiType, long timestamp) {
final long apiDurationBeforeFgsStart = r.mFgsEnterTime - timestamp; long apiDurationBeforeFgsStart = r.createRealTime - timestamp;
final long apiDurationAfterFgsEnd = timestamp - r.mFgsExitTime; long apiDurationAfterFgsEnd = timestamp - r.mFgsExitTime;
UidState uidState = mUids.get(r.appInfo.uid);
if (uidState != null) {
if (uidState.mFirstFgsTimeStamp.contains(apiType)) {
apiDurationBeforeFgsStart = uidState.mFirstFgsTimeStamp.get(apiType) - timestamp;
}
if (uidState.mLastFgsTimeStamp.contains(apiType)) {
apiDurationAfterFgsEnd = timestamp - uidState.mLastFgsTimeStamp.get(apiType);
}
}
final int[] apiTypes = new int[1]; final int[] apiTypes = new int[1];
apiTypes[0] = apiType; apiTypes[0] = apiType;
final long[] timeStamps = new long[1]; final long[] timeStamps = new long[1];