diff options
| author | 2022-08-25 15:18:28 +0000 | |
|---|---|---|
| committer | 2022-08-25 15:18:28 +0000 | |
| commit | 4bef36612653889cb36701477399e4d5d2592b2e (patch) | |
| tree | 3390f0ebb46fd1b8e5714f4758b9e17354717369 | |
| parent | da7e89fd5d9eb9e2f2a3c15f5f6dd33353ffa41c (diff) | |
| parent | f5906321ff97ed4bd5163ae331a5855f94fb96ce (diff) | |
Merge "Fix debug dump."
3 files changed, 5 insertions, 2 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/tare/Agent.java b/apex/jobscheduler/service/java/com/android/server/tare/Agent.java index d4a1cd234c39..f6219c5e10ab 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/Agent.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/Agent.java @@ -1325,7 +1325,6 @@ class Agent { @GuardedBy("mLock") void dumpLocked(IndentingPrintWriter pw) { - pw.println(); mBalanceThresholdAlarmQueue.dump(pw); pw.println(); diff --git a/apex/jobscheduler/service/java/com/android/server/tare/EconomicPolicy.java b/apex/jobscheduler/service/java/com/android/server/tare/EconomicPolicy.java index 2fb0c1a36e07..22a2f5163538 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/EconomicPolicy.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/EconomicPolicy.java @@ -405,6 +405,10 @@ public abstract class EconomicPolicy { return "PROMOTION"; case REGULATION_DEMOTION: return "DEMOTION"; + case REGULATION_BG_RESTRICTED: + return "BG_RESTRICTED"; + case REGULATION_BG_UNRESTRICTED: + return "BG_UNRESTRICTED"; } return "UNKNOWN_REGULATION:" + Integer.toHexString(eventId); } diff --git a/apex/jobscheduler/service/java/com/android/server/tare/Ledger.java b/apex/jobscheduler/service/java/com/android/server/tare/Ledger.java index e91ed1287e1b..620d1a0da76f 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/Ledger.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/Ledger.java @@ -247,7 +247,7 @@ class Ledger { boolean printedTransactionTitle = false; for (int t = 0; t < Math.min(MAX_TRANSACTION_COUNT, numRecentTransactions); ++t) { - final int idx = (mTransactionIndex - t + MAX_TRANSACTION_COUNT) % MAX_TRANSACTION_COUNT; + final int idx = (mTransactionIndex + t) % MAX_TRANSACTION_COUNT; final Transaction transaction = mTransactions[idx]; if (transaction == null) { continue; |