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

Commit 799fd15c authored by Kweku Adams's avatar Kweku Adams
Browse files

Migrate remote configuration to DeviceConfig. 

Move battery saver to retrieve remote configuration values via
DeviceConfig. Some products allow users to customize which battery saver
toggles are active, so leave the Global settings flag around to track
the user's choices. The user's choices will override anything sent from
the server.

Also renaming some of the flag names since we don't need to support
backwards compatibility for server-side pushes.

Bug: 79580230
Bug: 124466289
Test: atest com.android.server.power.batterysaver.BatterySaverPolicyTest
Test: atest com.android.server.power.batterysaver.BatterySaverStateMachineTest
Test: atest com.android.server.power.batterysaver.BatterySavingStatsTest
Test: atest com.android.server.power.PowerManagerServiceTest
Test: atest CtsBatterySavingTestCases
Test: atest CtsLocationFineTestCases
Change-Id: I47684efa5c4426e1c524fb9c1d4d407ee66fa3b7
parent 9efe2d3b

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8398,6 +8398,7 @@ package android.provider { 
    field public static final String NAMESPACE_APP_COMPAT = "app_compat";

    field public static final String NAMESPACE_ATTENTION_MANAGER_SERVICE = "attention_manager_service";

    field public static final String NAMESPACE_AUTOFILL = "autofill";

    field public static final String NAMESPACE_BATTERY_SAVER = "battery_saver";

    field public static final String NAMESPACE_BIOMETRICS = "biometrics";

    field public static final String NAMESPACE_BLOBSTORE = "blobstore";

    field public static final String NAMESPACE_BLUETOOTH = "bluetooth";

core/java/android/provider/DeviceConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -125,6 +125,14 @@ public final class DeviceConfig { 
    @SystemApi

    public static final String NAMESPACE_AUTOFILL = "autofill";



    /**

     * Namespace for battery saver feature.

     *

     * @hide

     */

    @SystemApi

    public static final String NAMESPACE_BATTERY_SAVER = "battery_saver";



    /**

     * Namespace for blobstore feature that allows apps to share data blobs.

     *

core/java/android/provider/Settings.java

+0 −18
Original line number Diff line number Diff line
@@ -11715,24 +11715,6 @@ public final class Settings { 
        public static final String BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS =

                "battery_saver_device_specific_constants";













        /**













         * Settings for adaptive Battery Saver mode. Uses the same flags as













         * {@link #BATTERY_SAVER_CONSTANTS}.













         *













         * @hide













         */













        public static final String BATTERY_SAVER_ADAPTIVE_CONSTANTS =













                "battery_saver_adaptive_constants";

























        /**













         * Device specific settings for adaptive Battery Saver mode. Uses the same flags as













         * {@link #BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS}.













         *













         * @hide













         */













        public static final String BATTERY_SAVER_ADAPTIVE_DEVICE_SPECIFIC_CONSTANTS =













                "battery_saver_adaptive_device_specific_constants";



























        /**















         * Battery tip specific settings















         * This is encoded as a key=value list, separated by commas. Ex:

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -146,7 +146,6 @@ public class SettingsBackupTest {













                    Settings.Global.BROADCAST_OFFLOAD_CONSTANTS,















                    Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,















                    Settings.Global.BATTERY_DISCHARGE_THRESHOLD,













                    Settings.Global.BATTERY_SAVER_ADAPTIVE_DEVICE_SPECIFIC_CONSTANTS,















                    Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS,















                    Settings.Global.BATTERY_STATS_CONSTANTS,















                    Settings.Global.BINDER_CALLS_STATS,










@@ -232,7 +231,6 @@ public class SettingsBackupTest {













                    Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_VR,















                    Settings.Global.DEVELOPMENT_IGNORE_VENDOR_DISPLAY_SETTINGS,















                    Settings.Global.DEVICE_DEMO_MODE,













                    Settings.Global.BATTERY_SAVER_ADAPTIVE_CONSTANTS,















                    Settings.Global.BATTERY_SAVER_CONSTANTS,















                    Settings.Global.BATTERY_TIP_CONSTANTS,















                    Settings.Global.DEFAULT_SM_DP_PLUS,

































services/core/java/com/android/server/power/batterysaver/BatterySaverController.java



+0
−6




























Original line number
Diff line number
Diff line








@@ -369,12 +369,6 @@ public class BatterySaverController implements BatterySaverPolicyListener {













        }















    }





























    boolean setAdaptivePolicyLocked(String settings, String deviceSpecificSettings, int reason) {













        return setAdaptivePolicyLocked(













                BatterySaverPolicy.Policy.fromSettings(settings, deviceSpecificSettings),













                reason);













    }





























    boolean setAdaptivePolicyLocked(BatterySaverPolicyConfig config, int reason) {















        return setAdaptivePolicyLocked(BatterySaverPolicy.Policy.fromConfig(config), reason);















    }