summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2014-02-25 00:40:54 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-25 00:40:54 +0000
commiteb1d804246f031889619e9c5466e899f95c249d0 (patch)
tree925b1388ec5b9960265e8042485848ffc33d43e0
parentef57d0214424607e39ae7e9bdd32d7ea8b651ed7 (diff)
parent01d63a35245ad20cf5251b69777db5c81fc76a84 (diff)
am 01d63a35: am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev
* commit '01d63a35245ad20cf5251b69777db5c81fc76a84': Fix typo that causes dreaming on battery.
-rw-r--r--services/core/java/com/android/server/power/PowerManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 0ba55b6ebacb..f420988ede81 100644
--- 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