Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix updating max circulation value."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-02 22:04:09 +00:00
committed by Android (Google) Code Review
parent 904427d6b5 dca9cf22a6
commit 59fb57da37
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/service/java/com/android/server/tare/AlarmManagerEconomicPolicy.java
View File

@@ -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:");

25
apex/jobscheduler/service/java/com/android/server/tare/CompleteEconomicPolicy.java
View File

@@ -33,8 +33,8 @@ public class CompleteEconomicPolicy extends EconomicPolicy {
/** Lazily populated set of rewards covered by this policy. */
private final SparseArray<Reward> 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;

2
apex/jobscheduler/service/java/com/android/server/tare/JobSchedulerEconomicPolicy.java
View File

@@ -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:");