summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/PowerManagerService.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2012-06-08 18:51:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-08 18:51:11 -0700
commitc99e6ee202ba9d895c96f034643fd39a035ea7f2 (patch)
treec0a8fb93100834841a0f3d35b0d180466db1b1b3 /services/java/com/android/server/PowerManagerService.java
parent60c7721210d327a464fdc95dbbe504e8eb10525c (diff)
parentc9aa32e93f39f84033e4ac812efec662a1f824ac (diff)
am c9aa32e9: Merge "Fix dumpPowerState method"
* commit 'c9aa32e93f39f84033e4ac812efec662a1f824ac': 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 2a0d2a086a94..5848cc9f6cd5 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1103,6 +1103,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 " : "");
}