diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 206f135aef994..5700bb367b041 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -5934,7 +5934,7 @@ public final class ActiveServices { */ private void logForegroundServiceStateChanged(ServiceRecord r, int state, int durationMs) { if (!ActivityManagerUtils.shouldSamplePackageForAtom( - r.packageName, mAm.mConstants.mDefaultFgsAtomSampleRate)) { + r.packageName, mAm.mConstants.mFgsAtomSampleRate)) { return; } FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, diff --git a/services/core/java/com/android/server/am/ActivityManagerConstants.java b/services/core/java/com/android/server/am/ActivityManagerConstants.java index d8eccef8488e8..6cd7eb7b7ad22 100644 --- a/services/core/java/com/android/server/am/ActivityManagerConstants.java +++ b/services/core/java/com/android/server/am/ActivityManagerConstants.java @@ -460,7 +460,7 @@ final class ActivityManagerConstants extends ContentObserver { * * If the value is 0.1, 10% of the installed packages would be sampled. */ - volatile float mDefaultFgsAtomSampleRate = DEFAULT_FGS_ATOM_SAMPLE_RATE; + volatile float mFgsAtomSampleRate = DEFAULT_FGS_ATOM_SAMPLE_RATE; private final ActivityManagerService mService; private ContentResolver mResolver; @@ -985,7 +985,7 @@ final class ActivityManagerConstants extends ContentObserver { } private void updateFgsAtomSamplePercent() { - mDefaultFgsAtomSampleRate = DeviceConfig.getFloat( + mFgsAtomSampleRate = DeviceConfig.getFloat( DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, KEY_FGS_ATOM_SAMPLE_RATE, DEFAULT_FGS_ATOM_SAMPLE_RATE); @@ -1204,7 +1204,7 @@ final class ActivityManagerConstants extends ContentObserver { pw.print(" "); pw.print(KEY_DEFAULT_FGS_STARTS_RESTRICTION_CHECK_CALLER_TARGET_SDK); pw.print("="); pw.println(mFgsStartRestrictionCheckCallerTargetSdk); pw.print(" "); pw.print(KEY_FGS_ATOM_SAMPLE_RATE); - pw.print("="); pw.println(mDefaultFgsAtomSampleRate); + pw.print("="); pw.println(mFgsAtomSampleRate); pw.print(" "); pw.print(KEY_PUSH_MESSAGING_OVER_QUOTA_BEHAVIOR); pw.print("="); pw.println(mPushMessagingOverQuotaBehavior);