Merge "JobScheduler: Trunk flag cleanup for wrong proc state logging fix" into main (d938ca87) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/aconfig/job.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -56,16 +56,6 @@ flag {
		bug: "337077643"
		}

		flag {
		name: "use_correct_process_state_for_logging"
		namespace: "backstage_power"
		description: "Use correct process state for statsd logging"
		bug: "361308212"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "enforce_quota_policy_to_fgs_jobs"
		namespace: "backstage_power"

+2 −4

Original line number	Diff line number	Diff line
		@@ -483,8 +483,7 @@ public final class JobServiceContext implements ServiceConnection {
		mInitialUploadedBytesFromCalling = TrafficStats.getUidTxBytes(job.getUid());

		int procState = mService.getUidProcState(job.getUid());
		if (Flags.useCorrectProcessStateForLogging()
		&& procState > ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND) {
		if (procState > ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND) {
		// Try to get the latest proc state from AMS, there might be some delay
		// for the proc states worse than TRANSIENT_BACKGROUND.
		procState = mActivityManagerInternal.getUidProcessState(job.getUid());
		@@ -1626,8 +1625,7 @@ public final class JobServiceContext implements ServiceConnection {
		loggingInternalStopReason, loggingDebugReason);
		final int sourceUid = completedJob.getSourceUid();
		int procState = mService.getUidProcState(completedJob.getUid());
		if (Flags.useCorrectProcessStateForLogging()
		&& procState > ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND) {
		if (procState > ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND) {
		// Try to get the latest proc state from AMS, there might be some delay
		// for the proc states worse than TRANSIENT_BACKGROUND.
		procState = mActivityManagerInternal.getUidProcessState(completedJob.getUid());