Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4f2d361 authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Update consumption limit constants." into tm-dev am: 5459451c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17264087

Change-Id: Idb0b754d434741d7196ecba02bd93e8e86326fb2
parents a4882453 5459451c

apex/jobscheduler/framework/java/android/app/tare/EconomyManager.java

+4 −4
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ public class EconomyManager { 
    /** @hide */

    public static final int DEFAULT_AM_MAX_SATIATED_BALANCE = 1440;

    /** @hide */

    public static final int DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT = 28800;

    public static final int DEFAULT_AM_INITIAL_CONSUMPTION_LIMIT = 4000;

    /** @hide */

    public static final int DEFAULT_AM_HARD_CONSUMPTION_LIMIT = 52000;

    public static final int DEFAULT_AM_HARD_CONSUMPTION_LIMIT = 28_800;

    // TODO: add AlarmManager modifier default values

    /** @hide */

    public static final int DEFAULT_AM_REWARD_TOP_ACTIVITY_INSTANT = 0;
@@ -373,9 +373,9 @@ public class EconomyManager { 
    /** @hide */

    public static final int DEFAULT_JS_MAX_SATIATED_BALANCE = 60000;

    /** @hide */

    public static final int DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT = 460_000;

    public static final int DEFAULT_JS_INITIAL_CONSUMPTION_LIMIT = 100_000;

    /** @hide */

    public static final int DEFAULT_JS_HARD_CONSUMPTION_LIMIT = 900_000;

    public static final int DEFAULT_JS_HARD_CONSUMPTION_LIMIT = 460_000;

    // TODO: add JobScheduler modifier default values

    /** @hide */

    public static final int DEFAULT_JS_REWARD_TOP_ACTIVITY_INSTANT = 0;