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

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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19114749



Change-Id: I6608b83db79c615c66915f9b4bec0e670758fcb6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 397c885c bcfe28d0

src/com/android/settings/development/StayAwakePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class StayAwakePreferenceController extends DeveloperOptionsPreferenceCon 
    @VisibleForTesting

    static final int SETTING_VALUE_ON =

            BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB

                    | BatteryManager.BATTERY_PLUGGED_WIRELESS;

                    | BatteryManager.BATTERY_PLUGGED_WIRELESS | BatteryManager.BATTERY_PLUGGED_DOCK;

    @VisibleForTesting

    SettingsObserver mSettingsObserver;