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

Commit 1face46f authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

Merge "Remove batterySaverScheduleProvide checking from BatterySaverUtils"

parents 232b59c8 2de8df0f

packages/SettingsLib/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ juliacr@google.com 
leifhendrik@google.com

tmfang@google.com

virgild@google.com

ykhung@google.com



# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)

per-file *.xml=*

packages/SettingsLib/src/com/android/settingslib/fuelgauge/BatterySaverUtils.java

+2 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.PowerManager; 
import android.os.UserHandle;

import android.provider.Settings.Global;

import android.provider.Settings.Secure;

import android.text.TextUtils;

import android.util.KeyValueListParser;

import android.util.Log;

import android.util.Slog;
@@ -221,17 +220,14 @@ public class BatterySaverUtils { 
    }



    /**

     * Reverts battery saver schedule mode to none if we are in a bad state where routine mode

     * is selected but no app is configured to actually provide the signal.

     * Reverts battery saver schedule mode to none if routine mode is selected.

     * @param context a valid context

     */

    public static void revertScheduleToNoneIfNeeded(Context context) {

        ContentResolver resolver = context.getContentResolver();

        final int currentMode = Global.getInt(resolver, Global.AUTOMATIC_POWER_SAVE_MODE,

                PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);

        boolean providerConfigured = !TextUtils.isEmpty(context.getString(

                com.android.internal.R.string.config_batterySaverScheduleProvider));

        if (currentMode == PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC && !providerConfigured) {

        if (currentMode == PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC) {

            Global.putInt(resolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);

            Global.putInt(resolver, Global.AUTOMATIC_POWER_SAVE_MODE,

                    PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);