diff --git a/apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java b/apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java index d7290191dc3c4..e1e6e47155aa4 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java @@ -357,7 +357,7 @@ public class AlarmManagerEconomicPolicy extends EconomicPolicy { pw.print("Other", narcToString(mMinSatiatedBalanceOther)).println(); pw.decreaseIndent(); pw.print("Max satiated balance", narcToString(mMaxSatiatedBalance)).println(); - pw.print("Min satiated circulation", narcToString(mMaxSatiatedCirculation)).println(); + pw.print("Max satiated circulation", narcToString(mMaxSatiatedCirculation)).println(); pw.println(); pw.println("Actions:"); diff --git a/apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java b/apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java index 7bf0e6defb582..a4e7b808ca6c7 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java @@ -33,8 +33,8 @@ public class CompleteEconomicPolicy extends EconomicPolicy { /** Lazily populated set of rewards covered by this policy. */ private final SparseArray mRewards = new SparseArray<>(); private final int[] mCostModifiers; - private final long mMaxSatiatedBalance; - private final long mMaxSatiatedCirculation; + private long mMaxSatiatedBalance; + private long mMaxSatiatedCirculation; CompleteEconomicPolicy(@NonNull InternalResourceService irs) { super(irs); @@ -53,6 +53,19 @@ public class CompleteEconomicPolicy extends EconomicPolicy { mCostModifiers[i] = costModifiers.valueAt(i); } + updateMaxBalances(); + } + + @Override + void setup() { + super.setup(); + for (int i = 0; i < mEnabledEconomicPolicies.size(); ++i) { + mEnabledEconomicPolicies.valueAt(i).setup(); + } + updateMaxBalances(); + } + + private void updateMaxBalances() { long max = 0; for (int i = 0; i < mEnabledEconomicPolicies.size(); ++i) { max += mEnabledEconomicPolicies.valueAt(i).getMaxSatiatedBalance(); @@ -66,14 +79,6 @@ public class CompleteEconomicPolicy extends EconomicPolicy { mMaxSatiatedCirculation = max; } - @Override - void setup() { - super.setup(); - for (int i = 0; i < mEnabledEconomicPolicies.size(); ++i) { - mEnabledEconomicPolicies.valueAt(i).setup(); - } - } - @Override long getMinSatiatedBalance(final int userId, @NonNull final String pkgName) { long min = 0; diff --git a/apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java b/apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java index 2318026d9f16b..1f8ce26a3fd9b 100644 --- a/apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java +++ b/apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java @@ -332,7 +332,7 @@ public class JobSchedulerEconomicPolicy extends EconomicPolicy { pw.print("Other", narcToString(mMinSatiatedBalanceOther)).println(); pw.decreaseIndent(); pw.print("Max satiated balance", narcToString(mMaxSatiatedBalance)).println(); - pw.print("Min satiated circulation", narcToString(mMaxSatiatedCirculation)).println(); + pw.print("Max satiated circulation", narcToString(mMaxSatiatedCirculation)).println(); pw.println(); pw.println("Actions:");