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

Commit 10f56ebc authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Move IndentingPrintWriter to android.util"

parents e809cc89 f800b70d

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -703,6 +703,7 @@ filegroup { 
        // TODO: remove these annotations as soon as we can use andoid.support.annotations.*

        ":framework-annotations",

        "core/java/android/net/DhcpResults.java",

        "core/java/android/util/IndentingPrintWriter.java",

        "core/java/android/util/LocalLog.java",

        "core/java/com/android/internal/util/HexDump.java",

        "core/java/com/android/internal/util/IndentingPrintWriter.java",
@@ -733,6 +734,7 @@ filegroup { 
filegroup {

    name: "framework-tethering-shared-srcs",

    srcs: [

        "core/java/android/util/IndentingPrintWriter.java",

        "core/java/android/util/LocalLog.java",

        "core/java/com/android/internal/util/IndentingPrintWriter.java",

        "core/java/com/android/internal/util/IState.java",
@@ -1131,6 +1133,7 @@ filegroup { 
        "core/java/android/os/BasicShellCommandHandler.java",

        "core/java/android/os/RegistrantList.java",

        "core/java/android/os/Registrant.java",

        "core/java/android/util/IndentingPrintWriter.java",

        "core/java/android/util/LocalLog.java",

        "core/java/android/util/TimeUtils.java",

        "core/java/com/android/internal/os/SomeArgs.java",
@@ -1153,6 +1156,7 @@ filegroup { 
filegroup {

    name: "framework-telephony-shared-srcs",

    srcs: [

        "core/java/android/util/IndentingPrintWriter.java",

        "core/java/android/util/RecurrenceRule.java",

        "core/java/com/android/internal/os/SomeArgs.java",

        "core/java/com/android/internal/util/BitwiseInputStream.java",

apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ import android.app.usage.UsageStatsManager.StandbyBuckets; 
import android.app.usage.UsageStatsManager.SystemForcedReasons;

import android.content.Context;

import android.os.Looper;



import com.android.internal.util.IndentingPrintWriter;

import android.util.IndentingPrintWriter;



import java.io.PrintWriter;

import java.lang.reflect.Constructor;

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

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.IntentFilter; 
import android.os.Handler;

import android.os.PowerManager;

import android.os.RemoteException;

import android.util.IndentingPrintWriter;

import android.util.Slog;

import android.util.TimeUtils;

import android.util.proto.ProtoOutputStream;
@@ -33,7 +34,6 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.procstats.ProcessStats;

import com.android.internal.os.BackgroundThread;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.StatLogger;

import com.android.server.job.JobSchedulerService.Constants;

import com.android.server.job.JobSchedulerService.MaxJobCountsPerMemoryTrimLevel;

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

+13 −13
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import android.os.WorkSource; 
import android.provider.Settings;

import android.text.format.DateUtils;

import android.util.ArrayMap;

import android.util.IndentingPrintWriter;

import android.util.KeyValueListParser;

import android.util.Log;

import android.util.Slog;
@@ -84,7 +85,6 @@ 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;

import com.android.server.FgThread;
@@ -684,12 +684,12 @@ public class JobSchedulerService extends com.android.server.SystemService 
        void dump(IndentingPrintWriter pw) {

            pw.println("Settings:");

            pw.increaseIndent();

            pw.printPair(KEY_MIN_READY_NON_ACTIVE_JOBS_COUNT,

            pw.print(KEY_MIN_READY_NON_ACTIVE_JOBS_COUNT,

                    MIN_READY_NON_ACTIVE_JOBS_COUNT).println();

            pw.printPair(KEY_MAX_NON_ACTIVE_JOB_BATCH_DELAY_MS,

            pw.print(KEY_MAX_NON_ACTIVE_JOB_BATCH_DELAY_MS,

                    MAX_NON_ACTIVE_JOB_BATCH_DELAY_MS).println();

            pw.printPair(KEY_HEAVY_USE_FACTOR, HEAVY_USE_FACTOR).println();

            pw.printPair(KEY_MODERATE_USE_FACTOR, MODERATE_USE_FACTOR).println();

            pw.print(KEY_HEAVY_USE_FACTOR, HEAVY_USE_FACTOR).println();

            pw.print(KEY_MODERATE_USE_FACTOR, MODERATE_USE_FACTOR).println();



            MAX_JOB_COUNTS_SCREEN_ON.normal.dump(pw, "");

            MAX_JOB_COUNTS_SCREEN_ON.moderate.dump(pw, "");
@@ -703,15 +703,15 @@ public class JobSchedulerService extends com.android.server.SystemService 


            SCREEN_OFF_JOB_CONCURRENCY_INCREASE_DELAY_MS.dump(pw, "");



            pw.printPair(KEY_MIN_LINEAR_BACKOFF_TIME, MIN_LINEAR_BACKOFF_TIME).println();

            pw.printPair(KEY_MIN_EXP_BACKOFF_TIME, MIN_EXP_BACKOFF_TIME).println();

            pw.printPair(KEY_CONN_CONGESTION_DELAY_FRAC, CONN_CONGESTION_DELAY_FRAC).println();

            pw.printPair(KEY_CONN_PREFETCH_RELAX_FRAC, CONN_PREFETCH_RELAX_FRAC).println();

            pw.print(KEY_MIN_LINEAR_BACKOFF_TIME, MIN_LINEAR_BACKOFF_TIME).println();

            pw.print(KEY_MIN_EXP_BACKOFF_TIME, MIN_EXP_BACKOFF_TIME).println();

            pw.print(KEY_CONN_CONGESTION_DELAY_FRAC, CONN_CONGESTION_DELAY_FRAC).println();

            pw.print(KEY_CONN_PREFETCH_RELAX_FRAC, CONN_PREFETCH_RELAX_FRAC).println();



            pw.printPair(KEY_ENABLE_API_QUOTAS, ENABLE_API_QUOTAS).println();

            pw.printPair(KEY_API_QUOTA_SCHEDULE_COUNT, API_QUOTA_SCHEDULE_COUNT).println();

            pw.printPair(KEY_API_QUOTA_SCHEDULE_WINDOW_MS, API_QUOTA_SCHEDULE_WINDOW_MS).println();

            pw.printPair(KEY_API_QUOTA_SCHEDULE_THROW_EXCEPTION,

            pw.print(KEY_ENABLE_API_QUOTAS, ENABLE_API_QUOTAS).println();

            pw.print(KEY_API_QUOTA_SCHEDULE_COUNT, API_QUOTA_SCHEDULE_COUNT).println();

            pw.print(KEY_API_QUOTA_SCHEDULE_WINDOW_MS, API_QUOTA_SCHEDULE_WINDOW_MS).println();

            pw.print(KEY_API_QUOTA_SCHEDULE_THROW_EXCEPTION,

                    API_QUOTA_SCHEDULE_THROW_EXCEPTION).println();



            pw.decreaseIndent();

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

+1 −1
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ import static com.android.server.job.JobSchedulerService.NEVER_INDEX; 


import android.os.SystemClock;

import android.os.UserHandle;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;



import com.android.internal.util.IndentingPrintWriter;

import com.android.server.AppStateTracker;

import com.android.server.AppStateTracker.Listener;

import com.android.server.LocalServices;