summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/PowerManagerService.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2012-06-08 19:00:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-08 19:00:38 -0700
commit8e4e7959362ebd6bf021b8cfc3839e4c0d522fde (patch)
tree1a00978e52f2087ea3e06417be33ad603b0162a8 /services/java/com/android/server/PowerManagerService.java
parentc3672a4e19d3a0063c6d467453e9d7e03b2c1d2f (diff)
parenta8e46828bf463cf542885d7726310abeac915e0a (diff)
am a8e46828: am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method"
* commit 'a8e46828bf463cf542885d7726310abeac915e0a': Fix dumpPowerState method
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
-rw-r--r--services/java/com/android/server/PowerManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index ca22ef8445b1..2318049965b6 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1157,6 +1157,8 @@ public class PowerManagerService extends IPowerManager.Stub
? "SCREEN_BRIGHT_BIT " : "")
+ (((state & SCREEN_ON_BIT) != 0)
? "SCREEN_ON_BIT " : "")
+ + (((state & BUTTON_BRIGHT_BIT) != 0)
+ ? "BUTTON_BRIGHT_BIT " : "")
+ (((state & BATTERY_LOW_BIT) != 0)
? "BATTERY_LOW_BIT " : "");
}