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

Commit 93a23bb3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use FrameworkStatsLog instead of StatsLog"

parents 8014f025 e9aec32f

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+5 −4
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ import android.util.Log; 
import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseIntArray;

import android.util.StatsLog;

import android.util.TimeUtils;

import android.util.proto.ProtoOutputStream;
@@ -85,6 +84,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.app.IBatteryStats;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.AppStateTracker;

import com.android.server.DeviceIdleInternal;
@@ -1171,9 +1171,9 @@ public class JobSchedulerService extends com.android.server.SystemService 
                jobStatus.enqueueWorkLocked(work);

            }



            StatsLog.write_non_chained(StatsLog.SCHEDULED_JOB_STATE_CHANGED,

            FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED,

                    uId, null, jobStatus.getBatteryName(),

                    StatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__SCHEDULED,

                    FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED__STATE__SCHEDULED,

                    JobProtoEnums.STOP_REASON_CANCELLED, jobStatus.getStandbyBucket(),

                    jobStatus.getJobId());
@@ -2567,7 +2567,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
                BatteryStatsInternal mBatteryStatsInternal = LocalServices.getService

                        (BatteryStatsInternal.class);

                mBatteryStatsInternal.noteJobsDeferred(uid, counter.numDeferred(), sinceLast);

                StatsLog.write_non_chained(StatsLog.DEFERRED_JOB_STATS_REPORTED, uid, null,

                FrameworkStatsLog.write_non_chained(

                        FrameworkStatsLog.DEFERRED_JOB_STATS_REPORTED, uid, null,

                        counter.numDeferred(), sinceLast);

            }

        }

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

+6 −4
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ import android.text.format.DateFormat; 
import android.util.ArraySet;

import android.util.Pair;

import android.util.Slog;

import android.util.StatsLog;

import android.util.TimeUtils;

import android.util.proto.ProtoOutputStream;



import com.android.internal.util.FrameworkStatsLog;

import com.android.server.LocalServices;

import com.android.server.job.GrantedUriPermissions;

import com.android.server.job.JobSchedulerInternal;
@@ -1059,10 +1059,12 @@ public final class JobStatus { 
        mReadyDynamicSatisfied =

                mDynamicConstraints == (satisfiedConstraints & mDynamicConstraints);

        if (STATS_LOG_ENABLED && (STATSD_CONSTRAINTS_TO_LOG & constraint) != 0) {

            StatsLog.write_non_chained(StatsLog.SCHEDULED_JOB_CONSTRAINT_CHANGED,

            FrameworkStatsLog.write_non_chained(

                    FrameworkStatsLog.SCHEDULED_JOB_CONSTRAINT_CHANGED,

                    sourceUid, null, getBatteryName(), getProtoConstraint(constraint),

                    state ? StatsLog.SCHEDULED_JOB_CONSTRAINT_CHANGED__STATE__SATISFIED

                            : StatsLog.SCHEDULED_JOB_CONSTRAINT_CHANGED__STATE__UNSATISFIED);

                    state ? FrameworkStatsLog.SCHEDULED_JOB_CONSTRAINT_CHANGED__STATE__SATISFIED

                            : FrameworkStatsLog

                                    .SCHEDULED_JOB_CONSTRAINT_CHANGED__STATE__UNSATISFIED);

        }

        return true;

    }