Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 888717b2 authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Updating to go back to repeated" into udc-dev am: 0a8777bb 

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



Change-Id: I6065660a78dccecf821d451c57aef1d71255680f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a530ba17 0a8777bb

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

+2 −2
Original line number Diff line number Diff line
@@ -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),

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

+12 −4
Original line number Diff line number Diff line
@@ -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,