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

Commit 4ce5e9bd authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Android (Google) Code Review
Browse files

Merge "Revert "Adding proc_state to logging""

parents f5bdec36 5376dd47

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

+2 −17
Original line number Diff line number Diff line
@@ -1560,8 +1560,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    jobStatus.getJob().getMinLatencyMillis(),

                    jobStatus.getEstimatedNetworkDownloadBytes(),

                    jobStatus.getEstimatedNetworkUploadBytes(),

                    jobStatus.getWorkCount(),

                    getProcState(jobStatus.getSourcePackageName()));

                    jobStatus.getWorkCount());



            // If the job is immediately ready to run, then we can just immediately

            // put it in the pending list and try to schedule it.  This is especially
@@ -1989,8 +1988,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    cancelled.getJob().getMinLatencyMillis(),

                    cancelled.getEstimatedNetworkDownloadBytes(),

                    cancelled.getEstimatedNetworkUploadBytes(),

                    cancelled.getWorkCount(),

                    getProcState(cancelled.getSourcePackageName()));

                    cancelled.getWorkCount());

        }

        // If this is a replacement, bring in the new version of the job

        if (incomingJob != null) {
@@ -5334,17 +5332,4 @@ public class JobSchedulerService extends com.android.server.SystemService 


        proto.flush();

    }



    /**

     * Returns OOM score for package name, to be used with

     * logging only.

     */

    int getProcState(String packageName) {

        try {

            return ActivityManager.getService().getPackageProcessState(

                    packageName, "system");

        } catch (RemoteException e) {

            return -1;

        }

    }

}

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

+3 −5
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ public final class JobServiceContext implements ServiceConnection { 
                removeOpTimeOutLocked();

                return false;

            }

            final String sourcePackage = job.getSourcePackageName();

            mJobPackageTracker.noteActive(job);

            FrameworkStatsLog.write_non_chained(FrameworkStatsLog.SCHEDULED_JOB_STATE_CHANGED,

                    job.getSourceUid(), null, job.getBatteryName(),
@@ -477,8 +476,8 @@ public final class JobServiceContext implements ServiceConnection { 
                    job.getJob().getMinLatencyMillis(),

                    job.getEstimatedNetworkDownloadBytes(),

                    job.getEstimatedNetworkUploadBytes(),

                    job.getWorkCount(),

                    mService.getProcState(sourcePackage));

                    job.getWorkCount());

            final String sourcePackage = job.getSourcePackageName();

            if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {

                final String componentPackage = job.getServiceComponent().getPackageName();

                String traceTag = "*job*<" + job.getSourceUid() + ">" + sourcePackage;
@@ -1448,8 +1447,7 @@ public final class JobServiceContext implements ServiceConnection { 
                completedJob.getJob().getMinLatencyMillis(),

                completedJob.getEstimatedNetworkDownloadBytes(),

                completedJob.getEstimatedNetworkUploadBytes(),

                completedJob.getWorkCount(),

                mService.getProcState(completedJob.getSourcePackageName()));

                completedJob.getWorkCount());

        if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {

            Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_SYSTEM_SERVER, "JobScheduler",

                    getId());