summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2012-06-08 18:33:48 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-08 18:33:48 -0700
commitc9aa32e93f39f84033e4ac812efec662a1f824ac (patch)
tree33e4e947a3f5c941055c9c4a637d782d7efa9b70
parent2a393a99dc9612516dd9efbf74b6b5924d7d608a (diff)
parent15415f57a317c7332327102fdbfbca50f1cb5724 (diff)
downloadbase-c9aa32e93f39f84033e4ac812efec662a1f824ac.tar.gz
Merge "Fix dumpPowerState method"
-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 " : "");
}