Merge "Add dock charging state into stay awake feature (2/2)" into tm-qpr-dev (db8dacec) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11309,6 +11309,7 @@ public final class Settings {
	* <li>{@link BatteryManager#BATTERY_PLUGGED_AC} to stay on for AC charger</li>		* <li>{@link BatteryManager#BATTERY_PLUGGED_AC} to stay on for AC charger</li>
	* <li>{@link BatteryManager#BATTERY_PLUGGED_USB} to stay on for USB charger</li>		* <li>{@link BatteryManager#BATTERY_PLUGGED_USB} to stay on for USB charger</li>
	* <li>{@link BatteryManager#BATTERY_PLUGGED_WIRELESS} to stay on for wireless charger</li>		* <li>{@link BatteryManager#BATTERY_PLUGGED_WIRELESS} to stay on for wireless charger</li>
			* <li>{@link BatteryManager#BATTERY_PLUGGED_DOCK} to stay on for dock charger</li>
	* </ul>		* </ul>
	* These values can be OR-ed together.		* These values can be OR-ed together.
	*/		*/

core/proto/android/server/powermanagerservice.proto

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -238,6 +238,7 @@ message PowerServiceSettingsAndConfigurationDumpProto {
	optional bool is_stay_on_while_plugged_in_ac = 1;		optional bool is_stay_on_while_plugged_in_ac = 1;
	optional bool is_stay_on_while_plugged_in_usb = 2;		optional bool is_stay_on_while_plugged_in_usb = 2;
	optional bool is_stay_on_while_plugged_in_wireless = 3;		optional bool is_stay_on_while_plugged_in_wireless = 3;
			optional bool is_stay_on_while_plugged_in_dock = 4;
	}		}
	message ScreenBrightnessSettingLimitsProto {		message ScreenBrightnessSettingLimitsProto {
	option (.android.msg_privacy).dest = DEST_AUTOMATIC;		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java

+19 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,19 +51,37 @@ public class GlobalSettingsValidators {
	\|\| (val == BatteryManager.BATTERY_PLUGGED_AC)		\|\| (val == BatteryManager.BATTERY_PLUGGED_AC)
	\|\| (val == BatteryManager.BATTERY_PLUGGED_USB)		\|\| (val == BatteryManager.BATTERY_PLUGGED_USB)
	\|\| (val == BatteryManager.BATTERY_PLUGGED_WIRELESS)		\|\| (val == BatteryManager.BATTERY_PLUGGED_WIRELESS)
			\|\| (val == BatteryManager.BATTERY_PLUGGED_DOCK)
	\|\| (val		\|\| (val
	== (BatteryManager.BATTERY_PLUGGED_AC		== (BatteryManager.BATTERY_PLUGGED_AC
	\| BatteryManager.BATTERY_PLUGGED_USB))		\| BatteryManager.BATTERY_PLUGGED_USB))
	\|\| (val		\|\| (val
	== (BatteryManager.BATTERY_PLUGGED_AC		== (BatteryManager.BATTERY_PLUGGED_AC
	\| BatteryManager.BATTERY_PLUGGED_WIRELESS))		\| BatteryManager.BATTERY_PLUGGED_WIRELESS))
			\|\| (val
			== (BatteryManager.BATTERY_PLUGGED_AC
			\| BatteryManager.BATTERY_PLUGGED_DOCK))
	\|\| (val		\|\| (val
	== (BatteryManager.BATTERY_PLUGGED_USB		== (BatteryManager.BATTERY_PLUGGED_USB
	\| BatteryManager.BATTERY_PLUGGED_WIRELESS))		\| BatteryManager.BATTERY_PLUGGED_WIRELESS))
			\|\| (val
			== (BatteryManager.BATTERY_PLUGGED_USB
			\| BatteryManager.BATTERY_PLUGGED_DOCK))
			\|\| (val
			== (BatteryManager.BATTERY_PLUGGED_WIRELESS
			\| BatteryManager.BATTERY_PLUGGED_DOCK))
	\|\| (val		\|\| (val
	== (BatteryManager.BATTERY_PLUGGED_AC		== (BatteryManager.BATTERY_PLUGGED_AC
	\| BatteryManager.BATTERY_PLUGGED_USB		\| BatteryManager.BATTERY_PLUGGED_USB
	\| BatteryManager.BATTERY_PLUGGED_WIRELESS));		\| BatteryManager.BATTERY_PLUGGED_WIRELESS))
			\|\| (val
			== (BatteryManager.BATTERY_PLUGGED_AC
			\| BatteryManager.BATTERY_PLUGGED_USB
			\| BatteryManager.BATTERY_PLUGGED_DOCK))
			\|\| (val
			== (BatteryManager.BATTERY_PLUGGED_USB
			\| BatteryManager.BATTERY_PLUGGED_WIRELESS
			\| BatteryManager.BATTERY_PLUGGED_DOCK));
	} catch (NumberFormatException e) {		} catch (NumberFormatException e) {
	return false;		return false;
	}		}

services/core/java/com/android/server/power/PowerManagerService.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4801,6 +4801,11 @@ public final class PowerManagerService extends SystemService
	.IS_STAY_ON_WHILE_PLUGGED_IN_WIRELESS,		.IS_STAY_ON_WHILE_PLUGGED_IN_WIRELESS,
	((mStayOnWhilePluggedInSetting & BatteryManager.BATTERY_PLUGGED_WIRELESS)		((mStayOnWhilePluggedInSetting & BatteryManager.BATTERY_PLUGGED_WIRELESS)
	!= 0));		!= 0));
			proto.write(
			PowerServiceSettingsAndConfigurationDumpProto.StayOnWhilePluggedInProto
			.IS_STAY_ON_WHILE_PLUGGED_IN_DOCK,
			((mStayOnWhilePluggedInSetting & BatteryManager.BATTERY_PLUGGED_DOCK)
			!= 0));
	proto.end(stayOnWhilePluggedInToken);		proto.end(stayOnWhilePluggedInToken);

	proto.write(		proto.write(