diff options
author | Daniel Sandler <dsandler@android.com> | 2011-11-29 05:54:09 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 05:54:09 -0800 |
commit | 0e9c942e4a97c0416928d9697f6e92be8faff5a3 (patch) | |
tree | e01b52851c07e7b62030ea968eafb5b81cf0e766 /policy | |
parent | 9a8246c8d1ea324b6704bf4fe0b77ade1c2f3639 (diff) | |
parent | 834c2870fa422098b3728ae26099b3030994f86f (diff) | |
download | frameworks_base-0e9c942e4a97c0416928d9697f6e92be8faff5a3.zip frameworks_base-0e9c942e4a97c0416928d9697f6e92be8faff5a3.tar.gz frameworks_base-0e9c942e4a97c0416928d9697f6e92be8faff5a3.tar.bz2 |
am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
* commit '834c2870fa422098b3728ae26099b3030994f86f':
Quick fix for bug 5646217 blocking automation tests
Diffstat (limited to 'policy')
-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 72856b8..bc65691 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3468,6 +3468,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"); |