Merge "SettingsProvider: Change default for def_stay_on_while_pluggd_in" into main (412ec48c) · Commits · e / os / android_frameworks_base

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);

+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
		}
		}