Commit 52be1a24 authored Aug 11, 2023 by Kweku Adams Committed by Cherrypicker Worker Aug 18, 2023

Fix dump override.

QuotaTracker was migrated to the android.util.IndentingPrintWriter class
but CountQuotaTracker wasn't updated and continued to use
com.android.internal.util.IndentingPrintWriter. Since the two methods
used different objects, CountQuotaTracker was no longer overriding
QuotaTracker.dump() and calls to CountQuotaTracker.dump() with the
android.util.IndentingPrintWriter went straight to QuotaTracker.dump.
Fixing the import ensures we dump the desired state.

Bug: 295532418
Test: atest CtsJobSchedulerTestCases:JobSchedulingTest
Test: Check jobscheduler dump
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:74e58076f089bf41b6a028c546d29421456024b1)
Merged-In: Ida5ff536602691d757fa483a92fc26950be0000d
Change-Id: Ida5ff536602691d757fa483a92fc26950be0000d

parent 1624ad46

services/core/java/com/android/server/utils/quota/CountQuotaTracker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.util.ArrayMap;
		import android.util.IndentingPrintWriter;
		import android.util.LongArrayQueue;
		import android.util.Slog;
		import android.util.TimeUtils;
		@@ -36,7 +37,6 @@ import android.util.quota.CountQuotaTrackerProto;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.IndentingPrintWriter;

		import java.util.function.Consumer;
		import java.util.function.Function;