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

Commit 88d62935 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Add option to force wake lock while USB connected" into gingerbread

parents 88267de7 a0ad54dd

services/java/com/android/server/PowerManagerService.java

+7 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.WorkSource;

import android.os.SystemProperties;

import android.provider.Settings.SettingNotFoundException;
@@ -486,8 +487,13 @@ class PowerManagerService extends IPowerManager.Stub 


            synchronized (mLocks) {

                // STAY_ON_WHILE_PLUGGED_IN, default to when plugged into AC

                if (SystemProperties.getBoolean("ro.pm.awake_on_usb", false)) {

                    mStayOnConditions = BatteryManager.BATTERY_PLUGGED_AC |

                        BatteryManager.BATTERY_PLUGGED_USB;

                } else {

                    mStayOnConditions = getInt(STAY_ON_WHILE_PLUGGED_IN,

                        BatteryManager.BATTERY_PLUGGED_AC);

                }

                updateWakeLockLocked();



                // SCREEN_OFF_TIMEOUT, default to 15 seconds