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

Commit 314b44a1 authored by Raul E Rangel's avatar Raul E Rangel Committed by Raul Rangel
Browse files

SettingsProvider: Change default for def_stay_on_while_pluggd_in 

STAY_ON_WHILE_PLUGGED_IN is a bit field. It currently has a default of
BATTERY_PLUGGED_AC. Desktop devices require BATTERY_PLUGGED_USB to be
enabled. This change makes it so that when `stay_on_while_plugged_in` is
set to `true` we set the bit field to `BATTERY_PLUGGED_ANY`. This
matches what the Settings UI does when a user manually checks the stay
awake checkbox.

https://cs.android.com/android/platform/superproject/main/+/main:packages/apps/Settings/src/com/android/settings/development/StayAwakePreferenceController.java;l=51;drc=97b516365117de515b633aac92d0fc940bd953b3

Bug: 403621105
Test: Set def_stay_on_while_plugged_in to true
Test: Use `adb shell settings get global stay_on_while_plugged_in` to verify flag before and after the flag was set.
Flag: com.android.providers.settings.use_new_stay_on_while_plugged_in_default
Change-Id: I98ff15959abf4e066053e3472eaa633bb746c677
parent fb75ed92

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+14 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.database.sqlite.SQLiteStatement; 
import android.media.AudioManager;

import android.media.AudioSystem;

import android.net.ConnectivityManager;

import android.os.BatteryManager;

import android.os.Build;

import android.os.Environment;

import android.os.SystemProperties;
@@ -2302,8 +2303,19 @@ class DatabaseHelper extends SQLiteOpenHelper { 
            loadBooleanSetting(stmt, Settings.Global.AUTO_TIME_ZONE,

                    R.bool.def_auto_time_zone); // Sync timezone to NITZ



            loadSetting(stmt, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,

            if (Flags.useNewStayOnWhilePluggedInDefault()) {

                loadSetting(

                        stmt,

                        Settings.Global.STAY_ON_WHILE_PLUGGED_IN,

                        (res.getBoolean(R.bool.def_stay_on_while_plugged_in)

                                ? BatteryManager.BATTERY_PLUGGED_ANY

                                : 0));

            } else {

                loadSetting(

                        stmt,

                        Settings.Global.STAY_ON_WHILE_PLUGGED_IN,

                        res.getBoolean(R.bool.def_stay_on_while_plugged_in) ? 1 : 0);

            }



            loadIntegerSetting(stmt, Settings.Global.WIFI_SLEEP_POLICY,

                    R.integer.def_wifi_sleep_policy);

packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig

+11 −1
Original line number Diff line number Diff line
@@ -101,3 +101,13 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "use_new_stay_on_while_plugged_in_default"

    namespace: "core_experiments_team_internal"

    description: "Sets the default for def_stay_on_while_plugged_in to BATTERY_PLUGGED_ANY from BATTERY_PLUGGED_AC."

    bug: "403621105"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}