From ef17b38898b7053599d0e98e967227b386b43ed2 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Thu, 16 Feb 2023 19:15:05 +0800 Subject: [PATCH] Update SystemSettingsValidators to support Dock plug type Bug: 268466100 Test: manual test passed Change-Id: I2d3a6cc75ed5a7f2070ec9e73014d2340b5589f0 Signed-off-by: Jack Wu --- .../settings/validators/SystemSettingsValidators.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java index 3fe12b3dab322..85623b26c5898 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java @@ -52,6 +52,7 @@ public class SystemSettingsValidators { || (val == BatteryManager.BATTERY_PLUGGED_AC) || (val == BatteryManager.BATTERY_PLUGGED_USB) || (val == BatteryManager.BATTERY_PLUGGED_WIRELESS) + || (val == BatteryManager.BATTERY_PLUGGED_DOCK) || (val == (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB)) @@ -64,7 +65,13 @@ public class SystemSettingsValidators { || (val == (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB - | BatteryManager.BATTERY_PLUGGED_WIRELESS)); + | BatteryManager.BATTERY_PLUGGED_WIRELESS)) + || (val + == (BatteryManager.BATTERY_PLUGGED_AC + | BatteryManager.BATTERY_PLUGGED_DOCK)) + || (val + == (BatteryManager.BATTERY_PLUGGED_USB + | BatteryManager.BATTERY_PLUGGED_DOCK)); } catch (NumberFormatException e) { return false; }