am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev

* commit 'ae8106ef9cdea9b6325afec197023d5b2d6214d0':
  Fix typo that causes dreaming on battery.
This commit is contained in:
Jeff Brown
2014-02-25 00:37:42 +00:00
committed by Android Git Automerger

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