From f6f9a4b7b207e76f7b036f798996862eb9865fd5 Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Fri, 28 Oct 2022 21:39:15 +0000
Subject: [PATCH] Allow modifying minimum consumption limit.

Create separate fields for minimum and initial consumption limits so
that they can be modified independently.

Bug: 255321890
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/tare
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/tare
Test: manually change in Developer Options UI
Change-Id: I82c146a18b54a18313de590038f2f807a2310aa0
---
 res/values/strings.xml                        |  8 ++++++--
 .../tare/AlarmManagerFragment.java            |  3 ++-
 .../tare/JobSchedulerFragment.java            |  3 ++-
 .../tare/TareFactorController.java            | 20 +++++++++++++------
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 30c1c0f069f..a0fb8e5d28c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11613,13 +11613,17 @@
     <!-- Title for the TARE policy factor that determines the initial maximum amount of credits that
     can be consumed by all the apps [CHAR LIMIT=80]-->
     <string name="tare_initial_consumption_limit">Initial Consumption Limit</string>
+    <!-- Title for the TARE policy factor that determines the minimum consumption limit the system
+     can have [CHAR LIMIT=80]-->
+    <string name="tare_min_consumption_limit">Minimum Consumption Limit</string>
     <!-- Title for the TARE policy factor that determines the maximum consumption limit the system
      can have [CHAR LIMIT=80]-->
-    <string name="tare_hard_consumption_limit">Maximum Consumption Limit</string>
+    <string name="tare_max_consumption_limit">Maximum Consumption Limit</string>
     <!-- Titles for the consumption limits factors. [CHAR LIMIT=40]-->
     <string-array name="tare_consumption_limit_subfactors" translatable="false">
         <item>@string/tare_initial_consumption_limit</item>
-        <item>@string/tare_hard_consumption_limit</item>
+        <item>@string/tare_min_consumption_limit</item>
+        <item>@string/tare_max_consumption_limit</item>
     </string-array>
     <!-- Title for the various modifiers that alter the cost of TARE tasks based on battery status
     (charging, power save mode, etc.) [CHAR LIMIT=40]-->
diff --git a/src/com/android/settings/development/tare/AlarmManagerFragment.java b/src/com/android/settings/development/tare/AlarmManagerFragment.java
index b9de81db62a..9b9eded98cf 100644
--- a/src/com/android/settings/development/tare/AlarmManagerFragment.java
+++ b/src/com/android/settings/development/tare/AlarmManagerFragment.java
@@ -117,7 +117,8 @@ public class AlarmManagerFragment extends Fragment implements
         mKeys = new String[][]{
                 {
                         EconomyManager.KEY_AM_INITIAL_CONSUMPTION_LIMIT,
-                        EconomyManager.KEY_AM_HARD_CONSUMPTION_LIMIT
+                        EconomyManager.KEY_AM_MIN_CONSUMPTION_LIMIT,
+                        EconomyManager.KEY_AM_MAX_CONSUMPTION_LIMIT,
                 },
                 {
                         EconomyManager.KEY_AM_MAX_SATIATED_BALANCE,
diff --git a/src/com/android/settings/development/tare/JobSchedulerFragment.java b/src/com/android/settings/development/tare/JobSchedulerFragment.java
index 9b8fb47dc99..e3b36a5dc02 100644
--- a/src/com/android/settings/development/tare/JobSchedulerFragment.java
+++ b/src/com/android/settings/development/tare/JobSchedulerFragment.java
@@ -118,7 +118,8 @@ public class JobSchedulerFragment extends Fragment implements
         mKeys = new String[][]{
                 {
                         EconomyManager.KEY_JS_INITIAL_CONSUMPTION_LIMIT,
-                        EconomyManager.KEY_JS_HARD_CONSUMPTION_LIMIT
+                        EconomyManager.KEY_JS_MIN_CONSUMPTION_LIMIT,
+                        EconomyManager.KEY_JS_MAX_CONSUMPTION_LIMIT,
                 },
                 {
                         EconomyManager.KEY_JS_MAX_SATIATED_BALANCE,
diff --git a/src/com/android/settings/development/tare/TareFactorController.java b/src/com/android/settings/development/tare/TareFactorController.java
index e6c2d8c878d..b5dd6ea677c 100644
--- a/src/com/android/settings/development/tare/TareFactorController.java
+++ b/src/com/android/settings/development/tare/TareFactorController.java
@@ -117,9 +117,13 @@ public class TareFactorController {
                 new TareFactorData(mResources.getString(R.string.tare_initial_consumption_limit),
                         EconomyManager.DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT_CAKES,
                         POLICY_ALARM_MANAGER));
-        mAlarmManagerMap.put(EconomyManager.KEY_AM_HARD_CONSUMPTION_LIMIT,
-                new TareFactorData(mResources.getString(R.string.tare_hard_consumption_limit),
-                        EconomyManager.DEFAULT_AM_HARD_CONSUMPTION_LIMIT_CAKES,
+        mAlarmManagerMap.put(EconomyManager.KEY_AM_MIN_CONSUMPTION_LIMIT,
+                new TareFactorData(mResources.getString(R.string.tare_min_consumption_limit),
+                        EconomyManager.DEFAULT_AM_MIN_CONSUMPTION_LIMIT_CAKES,
+                        POLICY_ALARM_MANAGER));
+        mAlarmManagerMap.put(EconomyManager.KEY_AM_MAX_CONSUMPTION_LIMIT,
+                new TareFactorData(mResources.getString(R.string.tare_max_consumption_limit),
+                        EconomyManager.DEFAULT_AM_MAX_CONSUMPTION_LIMIT_CAKES,
                         POLICY_ALARM_MANAGER));
         mAlarmManagerMap.put(EconomyManager.KEY_AM_REWARD_TOP_ACTIVITY_INSTANT,
                 new TareFactorData(mResources.getString(R.string.tare_top_activity),
@@ -306,9 +310,13 @@ public class TareFactorController {
                 new TareFactorData(mResources.getString(R.string.tare_initial_consumption_limit),
                         EconomyManager.DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT_CAKES,
                         POLICY_JOB_SCHEDULER));
-        mJobSchedulerMap.put(EconomyManager.KEY_JS_HARD_CONSUMPTION_LIMIT,
-                new TareFactorData(mResources.getString(R.string.tare_hard_consumption_limit),
-                        EconomyManager.DEFAULT_JS_HARD_CONSUMPTION_LIMIT_CAKES,
+        mJobSchedulerMap.put(EconomyManager.KEY_JS_MIN_CONSUMPTION_LIMIT,
+                new TareFactorData(mResources.getString(R.string.tare_min_consumption_limit),
+                        EconomyManager.DEFAULT_JS_MIN_CONSUMPTION_LIMIT_CAKES,
+                        POLICY_JOB_SCHEDULER));
+        mJobSchedulerMap.put(EconomyManager.KEY_JS_MAX_CONSUMPTION_LIMIT,
+                new TareFactorData(mResources.getString(R.string.tare_max_consumption_limit),
+                        EconomyManager.DEFAULT_JS_MAX_CONSUMPTION_LIMIT_CAKES,
                         POLICY_JOB_SCHEDULER));
         mJobSchedulerMap.put(EconomyManager.KEY_JS_REWARD_APP_INSTALL_INSTANT,
                 new TareFactorData(mResources.getString(R.string.tare_app_install),