diff options
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index fd9e095a5d0c..8f8ef912b1ac 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3465,6 +3465,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (localLOGV) Log.v(TAG, "mScreenSaverActivator: not running screen saver when not plugged in"); return; } + // Quick fix for automation tests. + // The correct fix is to move this triggering logic to PowerManager, where more complete + // information about wakelocks (including StayOnWhilePluggedIn) is available. + if (Settings.System.getInt(mContext.getContentResolver(), + Settings.System.STAY_ON_WHILE_PLUGGED_IN, + BatteryManager.BATTERY_PLUGGED_AC) != 0) { + Log.v(TAG, "mScreenSaverActivator: not running screen saver when STAY_ON_WHILE_PLUGGED_IN"); + return; + } if (localLOGV) Log.v(TAG, "mScreenSaverActivator entering dreamland"); |