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

* commit '2326acb591d889d9492219f5f8f79940fd66ba70': Fix typo that causes dreaming on battery.
2014-02-25 00:32:37 +00:00
parent 2235288538 2326acb591
commit ae8106ef9c
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -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