Merge "Fix typo that causes dreaming on battery." into klp-modular-dev

This commit is contained in:
Jeff Brown
2014-02-25 00:27:41 +00:00
committed by Android (Google) Code Review

View File

@ -1553,7 +1553,7 @@ public final class PowerManagerService extends com.android.server.SystemService
return false;
}
if (!isBeingKeptAwakeLocked()) {
if (!mIsPowered && !mDreamsEnabledByDefaultConfig) {
if (!mIsPowered && !mDreamsEnabledOnBatteryConfig) {
return false;
}
if (!mIsPowered