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

Commit 01bb5302 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

More consistent controller logging. 

Unify behind a single strategy that allows us to enable specific
controllers (or everything) via setprop for debugging.

Test: builds, boots
Bug: 73019091
Change-Id: I039a0b722c3da2c38d2ea64932b31281d85eab1a
parent f6669931

services/core/java/com/android/server/job/JobSchedulerService.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -43,8 +43,8 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.IntentFilter;

import android.content.pm.IPackageManager;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.PackageManagerInternal;

import android.content.pm.ServiceInfo;

import android.content.pm.ServiceInfo;

import android.database.ContentObserver;

import android.database.ContentObserver;

import android.net.Uri;

import android.net.Uri;
@@ -65,6 +65,7 @@ import android.os.UserManagerInternal; 
import android.provider.Settings;

import android.provider.Settings;

import android.text.format.DateUtils;

import android.text.format.DateUtils;

import android.util.KeyValueListParser;

import android.util.KeyValueListParser;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseArray;

import android.util.SparseIntArray;

import android.util.SparseIntArray;
@@ -79,9 +80,9 @@ import com.android.internal.os.BackgroundThread; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;

import com.android.server.AppStateTracker;

import com.android.server.DeviceIdleController;

import com.android.server.DeviceIdleController;

import com.android.server.FgThread;

import com.android.server.FgThread;

import com.android.server.AppStateTracker;

import com.android.server.LocalServices;

import com.android.server.LocalServices;

import com.android.server.job.JobSchedulerServiceDumpProto.ActiveJob;

import com.android.server.job.JobSchedulerServiceDumpProto.ActiveJob;

import com.android.server.job.JobSchedulerServiceDumpProto.PendingJob;

import com.android.server.job.JobSchedulerServiceDumpProto.PendingJob;
@@ -125,8 +126,8 @@ import java.util.function.Predicate; 
 */

 */

public final class JobSchedulerService extends com.android.server.SystemService

public final class JobSchedulerService extends com.android.server.SystemService

        implements StateChangedListener, JobCompletedListener {

        implements StateChangedListener, JobCompletedListener {

    static final String TAG = "JobSchedulerService";

    public static final String TAG = "JobScheduler";

    public static final boolean DEBUG = false;

    public static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    public static final boolean DEBUG_STANDBY = DEBUG || false;

    public static final boolean DEBUG_STANDBY = DEBUG || false;





    /** The maximum number of concurrent jobs we run at one time. */

    /** The maximum number of concurrent jobs we run at one time. */

services/core/java/com/android/server/job/controllers/AppIdleController.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.job.controllers; 
import android.app.usage.UsageStatsManagerInternal;

import android.app.usage.UsageStatsManagerInternal;

import android.content.Context;

import android.content.Context;

import android.os.UserHandle;

import android.os.UserHandle;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;
@@ -36,9 +37,9 @@ import java.io.PrintWriter; 
 * out of idle state, it will be allowed to run scheduled jobs.

 * out of idle state, it will be allowed to run scheduled jobs.

 */

 */

public final class AppIdleController extends StateController {

public final class AppIdleController extends StateController {



    private static final String TAG = "JobScheduler.AppIdle";

    private static final String LOG_TAG = "AppIdleController";

    private static final boolean DEBUG = JobSchedulerService.DEBUG

    private static final boolean DEBUG = false;

            || Log.isLoggable(TAG, Log.DEBUG);





    // Singleton factory

    // Singleton factory

    private static Object sCreationLock = new Object();

    private static Object sCreationLock = new Object();
@@ -56,7 +57,7 @@ public final class AppIdleController extends StateController { 
            final boolean appIdle = !mAppIdleParoleOn && mUsageStatsInternal.isAppIdle(packageName,

            final boolean appIdle = !mAppIdleParoleOn && mUsageStatsInternal.isAppIdle(packageName,

                    jobStatus.getSourceUid(), jobStatus.getSourceUserId());

                    jobStatus.getSourceUid(), jobStatus.getSourceUserId());

            if (DEBUG) {

            if (DEBUG) {

                Slog.d(LOG_TAG, "Setting idle state of " + packageName + " to " + appIdle);

                Slog.d(TAG, "Setting idle state of " + packageName + " to " + appIdle);

            }

            }

            if (jobStatus.setAppNotIdleConstraintSatisfied(!appIdle)) {

            if (jobStatus.setAppNotIdleConstraintSatisfied(!appIdle)) {

                mChanged = true;

                mChanged = true;
@@ -81,7 +82,7 @@ public final class AppIdleController extends StateController { 
                    && jobStatus.getSourceUserId() == mUserId) {

                    && jobStatus.getSourceUserId() == mUserId) {

                if (jobStatus.setAppNotIdleConstraintSatisfied(!mIdle)) {

                if (jobStatus.setAppNotIdleConstraintSatisfied(!mIdle)) {

                    if (DEBUG) {

                    if (DEBUG) {

                        Slog.d(LOG_TAG, "App Idle state changed, setting idle state of "

                        Slog.d(TAG, "App Idle state changed, setting idle state of "

                                + mPackage + " to " + mIdle);

                                + mPackage + " to " + mIdle);

                    }

                    }

                    mChanged = true;

                    mChanged = true;
@@ -118,7 +119,7 @@ public final class AppIdleController extends StateController { 
        final boolean appIdle = !mAppIdleParoleOn && mUsageStatsInternal.isAppIdle(packageName,

        final boolean appIdle = !mAppIdleParoleOn && mUsageStatsInternal.isAppIdle(packageName,

                jobStatus.getSourceUid(), jobStatus.getSourceUserId());

                jobStatus.getSourceUid(), jobStatus.getSourceUserId());

        if (DEBUG) {

        if (DEBUG) {

            Slog.d(LOG_TAG, "Start tracking, setting idle state of "

            Slog.d(TAG, "Start tracking, setting idle state of "

                    + packageName + " to " + appIdle);

                    + packageName + " to " + appIdle);

        }

        }

        jobStatus.setAppNotIdleConstraintSatisfied(!appIdle);

        jobStatus.setAppNotIdleConstraintSatisfied(!appIdle);
@@ -229,7 +230,7 @@ public final class AppIdleController extends StateController { 
        @Override

        @Override

        public void onParoleStateChanged(boolean isParoleOn) {

        public void onParoleStateChanged(boolean isParoleOn) {

            if (DEBUG) {

            if (DEBUG) {

                Slog.d(LOG_TAG, "Parole on: " + isParoleOn);

                Slog.d(TAG, "Parole on: " + isParoleOn);

            }

            }

            setAppIdleParoleOn(isParoleOn);

            setAppIdleParoleOn(isParoleOn);

        }

        }

services/core/java/com/android/server/job/controllers/BackgroundJobsController.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.job.controllers; 
import android.content.Context;

import android.content.Context;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserHandle;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;
@@ -34,9 +35,9 @@ import com.android.server.job.StateControllerProto.BackgroundJobsController.Trac 
import java.io.PrintWriter;

import java.io.PrintWriter;





public final class BackgroundJobsController extends StateController {

public final class BackgroundJobsController extends StateController {



    private static final String TAG = "JobScheduler.Background";

    private static final String LOG_TAG = "BackgroundJobsController";

    private static final boolean DEBUG = JobSchedulerService.DEBUG

    private static final boolean DEBUG = JobSchedulerService.DEBUG;

            || Log.isLoggable(TAG, Log.DEBUG);





    // Singleton factory

    // Singleton factory

    private static final Object sCreationLock = new Object();

    private static final Object sCreationLock = new Object();
@@ -179,7 +180,7 @@ public final class BackgroundJobsController extends StateController { 




        final long time = DEBUG ? (SystemClock.elapsedRealtimeNanos() - start) : 0;

        final long time = DEBUG ? (SystemClock.elapsedRealtimeNanos() - start) : 0;

        if (DEBUG) {

        if (DEBUG) {

            Slog.d(LOG_TAG, String.format(

            Slog.d(TAG, String.format(

                    "Job status updated: %d/%d checked/total jobs, %d us",

                    "Job status updated: %d/%d checked/total jobs, %d us",

                    updateTrackedJobs.mCheckedCount,

                    updateTrackedJobs.mCheckedCount,

                    updateTrackedJobs.mTotalCount,

                    updateTrackedJobs.mTotalCount,

services/core/java/com/android/server/job/controllers/BatteryController.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.BatteryManager; 
import android.os.BatteryManagerInternal;

import android.os.BatteryManagerInternal;

import android.os.UserHandle;

import android.os.UserHandle;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;
@@ -43,7 +44,9 @@ import java.io.PrintWriter; 
 * ACTION_BATTERY_OK.

 * ACTION_BATTERY_OK.

 */

 */

public final class BatteryController extends StateController {

public final class BatteryController extends StateController {

    private static final String TAG = "JobScheduler.Batt";

    private static final String TAG = "JobScheduler.Battery";

    private static final boolean DEBUG = JobSchedulerService.DEBUG

            || Log.isLoggable(TAG, Log.DEBUG);





    private static final Object sCreationLock = new Object();

    private static final Object sCreationLock = new Object();

    private static volatile BatteryController sController;

    private static volatile BatteryController sController;

services/core/java/com/android/server/job/controllers/ConnectivityController.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.Process; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.text.format.DateUtils;

import android.text.format.DateUtils;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;
@@ -56,8 +57,9 @@ import java.io.PrintWriter; 
 */

 */

public final class ConnectivityController extends StateController implements

public final class ConnectivityController extends StateController implements

        ConnectivityManager.OnNetworkActiveListener {

        ConnectivityManager.OnNetworkActiveListener {

    private static final String TAG = "JobScheduler.Conn";

    private static final String TAG = "JobScheduler.Connectivity";

    private static final boolean DEBUG = false;

    private static final boolean DEBUG = JobSchedulerService.DEBUG

            || Log.isLoggable(TAG, Log.DEBUG);





    private final ConnectivityManager mConnManager;

    private final ConnectivityManager mConnManager;

    private final NetworkPolicyManager mNetPolicyManager;

    private final NetworkPolicyManager mNetPolicyManager;