Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add dock charging state into stay awake feature (2/2)" into tm-qpr-dev am: db8dacec8a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19116650

Change-Id: I3e07127a49dedb42f441a70e9555fdfb182d00f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-26 16:37:11 +00:00
committed by Automerger Merge Worker
parent 416b8303d2 db8dacec8a
commit 57b0b38b61
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/provider/Settings.java
View File

@@ -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.
*/ */

1
core/proto/android/server/powermanagerservice.proto
View File

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

20
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -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
== (BatteryManager.BATTERY_PLUGGED_AC
| BatteryManager.BATTERY_PLUGGED_USB
| BatteryManager.BATTERY_PLUGGED_WIRELESS))
|| (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_DOCK))
|| (val
== (BatteryManager.BATTERY_PLUGGED_USB
| BatteryManager.BATTERY_PLUGGED_WIRELESS
| BatteryManager.BATTERY_PLUGGED_DOCK));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return false; return false;
} }

5
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -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(