Merge "Add 6 more fields to ForegroundServiceStateChanged" into udc-qpr-dev (6ff0eddd) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -8166,7 +8166,13 @@ public final class ActiveServices {
		mAm.getUidStateLocked(r.mRecentCallingUid),
		mAm.getUidProcessCapabilityLocked(r.mRecentCallingUid),
		0,
		0);
		0,
		r.mAllowWhileInUsePermissionInFgsReasonNoBinding,
		r.mAllowWIUInBindService,
		r.mAllowWIUByBindings,
		r.mAllowStartForegroundNoBinding,
		r.mAllowStartInBindService,
		r.mAllowStartByBindings);

		int event = 0;
		if (state == FOREGROUND_SERVICE_STATE_CHANGED__STATE__ENTER) {

+14 −2

Original line number	Diff line number	Diff line
		@@ -506,7 +506,13 @@ public class ForegroundServiceTypeLoggerModule {
		ActivityManager.PROCESS_STATE_UNKNOWN,
		ActivityManager.PROCESS_CAPABILITY_NONE,
		apiDurationBeforeFgsStart,
		apiDurationAfterFgsEnd);
		apiDurationAfterFgsEnd,
		r.mAllowWhileInUsePermissionInFgsReasonNoBinding,
		r.mAllowWIUInBindService,
		r.mAllowWIUByBindings,
		r.mAllowStartForegroundNoBinding,
		r.mAllowStartInBindService,
		r.mAllowStartByBindings);
		}

		/**
		@@ -557,7 +563,13 @@ public class ForegroundServiceTypeLoggerModule {
		ActivityManager.PROCESS_STATE_UNKNOWN,
		ActivityManager.PROCESS_CAPABILITY_NONE,
		0,
		apiDurationAfterFgsEnd);
		apiDurationAfterFgsEnd,
		0,
		0,
		0,
		0,
		0,
		0);
		}

		/**