Merge "Reduce background FGS start WTF log messages." into sc-dev am: f544ad608a am: f61e1aa126 (1f9a6225) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -6567,10 +6567,17 @@ public final class ActiveServices {
		final String msg = "Background started FGS: "
		+ ((r.mAllowStartForeground != REASON_DENIED) ? "Allowed " : "Disallowed ")
		+ r.mInfoAllowStartForeground;
		Slog.wtfQuiet(TAG, msg);
		if (r.mAllowStartForeground != REASON_DENIED) {
		if (ActivityManagerUtils.shouldSamplePackageForAtom(r.packageName,
		mAm.mConstants.mFgsStartAllowedLogSampleRate)) {
		Slog.wtfQuiet(TAG, msg);
		}
		Slog.i(TAG, msg);
		} else {
		if (ActivityManagerUtils.shouldSamplePackageForAtom(r.packageName,
		mAm.mConstants.mFgsStartDeniedLogSampleRate)) {
		Slog.wtfQuiet(TAG, msg);
		}
		Slog.w(TAG, msg);
		}
		r.mLoggedInfoAllowStartForeground = true;

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

+42 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,8 @@ final class ActivityManagerConstants extends ContentObserver {
		static final String KEY_FG_TO_BG_FGS_GRACE_DURATION = "fg_to_bg_fgs_grace_duration";
		static final String KEY_FGS_START_FOREGROUND_TIMEOUT = "fgs_start_foreground_timeout";
		static final String KEY_FGS_ATOM_SAMPLE_RATE = "fgs_atom_sample_rate";
		static final String KEY_FGS_START_ALLOWED_LOG_SAMPLE_RATE = "fgs_start_allowed_log_sample_rate";
		static final String KEY_FGS_START_DENIED_LOG_SAMPLE_RATE = "fgs_start_denied_log_sample_rate";
		static final String KEY_FGS_ALLOW_OPT_OUT = "fgs_allow_opt_out";
		static final String KEY_EXTRA_SERVICE_RESTART_DELAY_ON_MEM_PRESSURE =
		"extra_delay_svc_restart_mem_pressure";
		@@ -160,6 +162,8 @@ final class ActivityManagerConstants extends ContentObserver {
		private static final long DEFAULT_FG_TO_BG_FGS_GRACE_DURATION = 5 * 1000;
		private static final int DEFAULT_FGS_START_FOREGROUND_TIMEOUT_MS = 10 * 1000;
		private static final float DEFAULT_FGS_ATOM_SAMPLE_RATE = 1; // 100 %
		private static final float DEFAULT_FGS_START_ALLOWED_LOG_SAMPLE_RATE = 0.25f; // 25%
		private static final float DEFAULT_FGS_START_DENIED_LOG_SAMPLE_RATE = 1; // 100%
		/**
		* Same as {@link TEMPORARY_ALLOW_LIST_TYPE_FOREGROUND_SERVICE_NOT_ALLOWED}
		*/
		@@ -522,6 +526,20 @@ final class ActivityManagerConstants extends ContentObserver {
		*/
		volatile float mFgsAtomSampleRate = DEFAULT_FGS_ATOM_SAMPLE_RATE;

		/**
		* Sample rate for the allowed FGS start WTF logs.
		*
		* If the value is 0.1, 10% of the logs would be sampled.
		*/
		volatile float mFgsStartAllowedLogSampleRate = DEFAULT_FGS_START_ALLOWED_LOG_SAMPLE_RATE;

		/**
		* Sample rate for the denied FGS start WTF logs.
		*
		* If the value is 0.1, 10% of the logs would be sampled.
		*/
		volatile float mFgsStartDeniedLogSampleRate = DEFAULT_FGS_START_DENIED_LOG_SAMPLE_RATE;

		/**
		* Whether to allow "opt-out" from the foreground service restrictions.
		* (https://developer.android.com/about/versions/12/foreground-services)
		@@ -752,6 +770,12 @@ final class ActivityManagerConstants extends ContentObserver {
		case KEY_FGS_ATOM_SAMPLE_RATE:
		updateFgsAtomSamplePercent();
		break;
		case KEY_FGS_START_ALLOWED_LOG_SAMPLE_RATE:
		updateFgsStartAllowedLogSamplePercent();
		break;
		case KEY_FGS_START_DENIED_LOG_SAMPLE_RATE:
		updateFgsStartDeniedLogSamplePercent();
		break;
		case KEY_FGS_ALLOW_OPT_OUT:
		updateFgsAllowOptOut();
		break;
		@@ -1104,6 +1128,20 @@ final class ActivityManagerConstants extends ContentObserver {
		DEFAULT_FGS_ATOM_SAMPLE_RATE);
		}

		private void updateFgsStartAllowedLogSamplePercent() {
		mFgsStartAllowedLogSampleRate = DeviceConfig.getFloat(
		DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
		KEY_FGS_START_ALLOWED_LOG_SAMPLE_RATE,
		DEFAULT_FGS_START_ALLOWED_LOG_SAMPLE_RATE);
		}

		private void updateFgsStartDeniedLogSamplePercent() {
		mFgsStartDeniedLogSampleRate = DeviceConfig.getFloat(
		DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
		KEY_FGS_START_DENIED_LOG_SAMPLE_RATE,
		DEFAULT_FGS_START_DENIED_LOG_SAMPLE_RATE);
		}

		private void updateFgsAllowOptOut() {
		mFgsAllowOptOut = DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
		@@ -1377,6 +1415,10 @@ final class ActivityManagerConstants extends ContentObserver {
		pw.print("="); pw.println(mFgsStartRestrictionCheckCallerTargetSdk);
		pw.print(" "); pw.print(KEY_FGS_ATOM_SAMPLE_RATE);
		pw.print("="); pw.println(mFgsAtomSampleRate);
		pw.print(" "); pw.print(KEY_FGS_START_ALLOWED_LOG_SAMPLE_RATE);
		pw.print("="); pw.println(mFgsStartAllowedLogSampleRate);
		pw.print(" "); pw.print(KEY_FGS_START_DENIED_LOG_SAMPLE_RATE);
		pw.print("="); pw.println(mFgsStartDeniedLogSampleRate);
		pw.print(" "); pw.print(KEY_PUSH_MESSAGING_OVER_QUOTA_BEHAVIOR);
		pw.print("="); pw.println(mPushMessagingOverQuotaBehavior);
		pw.print(" "); pw.print(KEY_FGS_ALLOW_OPT_OUT);