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

Merge "Updating to go back to repeated" into udc-dev

Browse Source
This commit is contained in:
Kunal Malhotra
2023-05-19 19:57:10 +00:00
committed by Android (Google) Code Review
parent 0c903d88d3 0e44f031e5
commit 0a8777bb8b
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -8297,8 +8297,8 @@ public final class ActiveServices {
r.mFgsDelegation != null ? r.mFgsDelegation.mOptions.mDelegationService r.mFgsDelegation != null ? r.mFgsDelegation.mOptions.mDelegationService
: ForegroundServiceDelegationOptions.DELEGATION_SERVICE_DEFAULT, : ForegroundServiceDelegationOptions.DELEGATION_SERVICE_DEFAULT,
0 /* api_sate */, 0 /* api_sate */,
0 /* api_type */, null /* api_type */,
0 /* api_timestamp */, null /* api_timestamp */,
mAm.getUidStateLocked(r.appInfo.uid), mAm.getUidStateLocked(r.appInfo.uid),
mAm.getUidProcessCapabilityLocked(r.appInfo.uid), mAm.getUidProcessCapabilityLocked(r.appInfo.uid),
mAm.getUidStateLocked(r.mRecentCallingUid), mAm.getUidStateLocked(r.mRecentCallingUid),

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

@@ -451,6 +451,10 @@ public class ForegroundServiceTypeLoggerModule {
@ForegroundServiceApiType int apiType, long timestamp) { @ForegroundServiceApiType int apiType, long timestamp) {
final long apiDurationBeforeFgsStart = r.mFgsEnterTime - timestamp; final long apiDurationBeforeFgsStart = r.mFgsEnterTime - timestamp;
final long apiDurationAfterFgsEnd = timestamp - r.mFgsExitTime; 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, FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED,
r.appInfo.uid, r.appInfo.uid,
r.shortInstanceName, r.shortInstanceName,
@@ -475,8 +479,8 @@ public class ForegroundServiceTypeLoggerModule {
r.mFgsDelegation != null ? r.mFgsDelegation.mOptions.mDelegationService r.mFgsDelegation != null ? r.mFgsDelegation.mOptions.mDelegationService
: ForegroundServiceDelegationOptions.DELEGATION_SERVICE_DEFAULT, : ForegroundServiceDelegationOptions.DELEGATION_SERVICE_DEFAULT,
apiState, apiState,
apiType, apiTypes,
timestamp, timeStamps,
ActivityManager.PROCESS_STATE_UNKNOWN, ActivityManager.PROCESS_STATE_UNKNOWN,
ActivityManager.PROCESS_CAPABILITY_NONE, ActivityManager.PROCESS_CAPABILITY_NONE,
ActivityManager.PROCESS_STATE_UNKNOWN, ActivityManager.PROCESS_STATE_UNKNOWN,
@@ -500,6 +504,10 @@ public class ForegroundServiceTypeLoggerModule {
apiDurationAfterFgsEnd = timestamp - uidState.mLastFgsTimeStamp.get(apiType); 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, FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED,
uid, uid,
null, null,
@@ -522,8 +530,8 @@ public class ForegroundServiceTypeLoggerModule {
0, 0,
0, 0,
apiState, apiState,
apiType, apiTypes,
timestamp, timeStamps,
ActivityManager.PROCESS_STATE_UNKNOWN, ActivityManager.PROCESS_STATE_UNKNOWN,
ActivityManager.PROCESS_CAPABILITY_NONE, ActivityManager.PROCESS_CAPABILITY_NONE,
ActivityManager.PROCESS_STATE_UNKNOWN, ActivityManager.PROCESS_STATE_UNKNOWN,