Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

Browse Source
This commit is contained in:
Daniel Sandler
2011-11-29 05:49:11 -08:00
committed by Android (Google) Code Review
parent 4e5d3f2ca0 7d46c613f6
commit fed7a99a52
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -3465,6 +3465,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (localLOGV) Log.v(TAG, "mScreenSaverActivator: not running screen saver when not plugged in"); if (localLOGV) Log.v(TAG, "mScreenSaverActivator: not running screen saver when not plugged in");
return; 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"); if (localLOGV) Log.v(TAG, "mScreenSaverActivator entering dreamland");