Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83a7ad8e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update SystemSettingsValidators to support Dock plug type" into udc-dev am: 2cbedeb0 

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



Change-Id: Ia7b3ac6ff34c653ee4cd80a5b8e56b2a6de4e3c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd51e149 2cbedeb0

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

+8 −1
Original line number Diff line number Diff line
@@ -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;

                    }