Merge "Update SystemSettingsValidators to support Dock plug type" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2cbedeb0d7
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user