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

Commit 814d0fa2 authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Fix field name" into sc-dev am: fb5f63e5 

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

Change-Id: I9696edb69fc6529d35e8b2aa9c1762901cbc41a6
parents 199336b1 fb5f63e5

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -5934,7 +5934,7 @@ public final class ActiveServices { 
     */

     */

    private void logForegroundServiceStateChanged(ServiceRecord r, int state, int durationMs) {

    private void logForegroundServiceStateChanged(ServiceRecord r, int state, int durationMs) {

        if (!ActivityManagerUtils.shouldSamplePackageForAtom(

        if (!ActivityManagerUtils.shouldSamplePackageForAtom(

                r.packageName, mAm.mConstants.mDefaultFgsAtomSampleRate)) {

                r.packageName, mAm.mConstants.mFgsAtomSampleRate)) {

            return;

            return;

        }

        }

        FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED,

        FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED,

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -460,7 +460,7 @@ final class ActivityManagerConstants extends ContentObserver { 
     *

     *

     * If the value is 0.1, 10% of the installed packages would be sampled.

     * 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 final ActivityManagerService mService;

    private ContentResolver mResolver;

    private ContentResolver mResolver;
@@ -985,7 +985,7 @@ final class ActivityManagerConstants extends ContentObserver { 
    }

    }





    private void updateFgsAtomSamplePercent() {

    private void updateFgsAtomSamplePercent() {

        mDefaultFgsAtomSampleRate = DeviceConfig.getFloat(

        mFgsAtomSampleRate = DeviceConfig.getFloat(

                DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,

                KEY_FGS_ATOM_SAMPLE_RATE,

                KEY_FGS_ATOM_SAMPLE_RATE,

                DEFAULT_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.print(KEY_DEFAULT_FGS_STARTS_RESTRICTION_CHECK_CALLER_TARGET_SDK);

        pw.print("="); pw.println(mFgsStartRestrictionCheckCallerTargetSdk);

        pw.print("="); pw.println(mFgsStartRestrictionCheckCallerTargetSdk);

        pw.print("  "); pw.print(KEY_FGS_ATOM_SAMPLE_RATE);

        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.print(KEY_PUSH_MESSAGING_OVER_QUOTA_BEHAVIOR);

        pw.print("="); pw.println(mPushMessagingOverQuotaBehavior);

        pw.print("="); pw.println(mPushMessagingOverQuotaBehavior);