PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow modifying minimum consumption limit.

Browse Source 
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
This commit is contained in:
Kweku Adams
2022-10-28 21:39:15 +00:00
parent e3e6b7e76f
commit f6f9a4b7b2
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -11613,13 +11613,17 @@
<!-- Title for the TARE policy factor that determines the initial maximum amount of credits that <!-- 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]--> can be consumed by all the apps [CHAR LIMIT=80]-->
<string name="tare_initial_consumption_limit">Initial Consumption Limit</string> <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 <!-- Title for the TARE policy factor that determines the maximum consumption limit the system
can have [CHAR LIMIT=80]--> 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]--> <!-- Titles for the consumption limits factors. [CHAR LIMIT=40]-->
<string-array name="tare_consumption_limit_subfactors" translatable="false"> <string-array name="tare_consumption_limit_subfactors" translatable="false">
<item>@string/tare_initial_consumption_limit</item> <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> </string-array>
<!-- Title for the various modifiers that alter the cost of TARE tasks based on battery status <!-- Title for the various modifiers that alter the cost of TARE tasks based on battery status
(charging, power save mode, etc.) [CHAR LIMIT=40]--> (charging, power save mode, etc.) [CHAR LIMIT=40]-->

3
src/com/android/settings/development/tare/AlarmManagerFragment.java
View File

@@ -117,7 +117,8 @@ public class AlarmManagerFragment extends Fragment implements
mKeys = new String[][]{ mKeys = new String[][]{
{ {
EconomyManager.KEY_AM_INITIAL_CONSUMPTION_LIMIT, 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, EconomyManager.KEY_AM_MAX_SATIATED_BALANCE,

3
src/com/android/settings/development/tare/JobSchedulerFragment.java
View File

@@ -118,7 +118,8 @@ public class JobSchedulerFragment extends Fragment implements
mKeys = new String[][]{ mKeys = new String[][]{
{ {
EconomyManager.KEY_JS_INITIAL_CONSUMPTION_LIMIT, 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, EconomyManager.KEY_JS_MAX_SATIATED_BALANCE,

20
src/com/android/settings/development/tare/TareFactorController.java
View File

@@ -117,9 +117,13 @@ public class TareFactorController {
new TareFactorData(mResources.getString(R.string.tare_initial_consumption_limit), new TareFactorData(mResources.getString(R.string.tare_initial_consumption_limit),
EconomyManager.DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT_CAKES, EconomyManager.DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT_CAKES,
POLICY_ALARM_MANAGER)); POLICY_ALARM_MANAGER));
mAlarmManagerMap.put(EconomyManager.KEY_AM_HARD_CONSUMPTION_LIMIT, mAlarmManagerMap.put(EconomyManager.KEY_AM_MIN_CONSUMPTION_LIMIT,
new TareFactorData(mResources.getString(R.string.tare_hard_consumption_limit), new TareFactorData(mResources.getString(R.string.tare_min_consumption_limit),
EconomyManager.DEFAULT_AM_HARD_CONSUMPTION_LIMIT_CAKES, 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)); POLICY_ALARM_MANAGER));
mAlarmManagerMap.put(EconomyManager.KEY_AM_REWARD_TOP_ACTIVITY_INSTANT, mAlarmManagerMap.put(EconomyManager.KEY_AM_REWARD_TOP_ACTIVITY_INSTANT,
new TareFactorData(mResources.getString(R.string.tare_top_activity), 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), new TareFactorData(mResources.getString(R.string.tare_initial_consumption_limit),
EconomyManager.DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT_CAKES, EconomyManager.DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT_CAKES,
POLICY_JOB_SCHEDULER)); POLICY_JOB_SCHEDULER));
mJobSchedulerMap.put(EconomyManager.KEY_JS_HARD_CONSUMPTION_LIMIT, mJobSchedulerMap.put(EconomyManager.KEY_JS_MIN_CONSUMPTION_LIMIT,
new TareFactorData(mResources.getString(R.string.tare_hard_consumption_limit), new TareFactorData(mResources.getString(R.string.tare_min_consumption_limit),
EconomyManager.DEFAULT_JS_HARD_CONSUMPTION_LIMIT_CAKES, 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)); POLICY_JOB_SCHEDULER));
mJobSchedulerMap.put(EconomyManager.KEY_JS_REWARD_APP_INSTALL_INSTANT, mJobSchedulerMap.put(EconomyManager.KEY_JS_REWARD_APP_INSTALL_INSTANT,
new TareFactorData(mResources.getString(R.string.tare_app_install), new TareFactorData(mResources.getString(R.string.tare_app_install),