diff options
author | Dianne Hackborn <hackbod@android.com> | 2012-06-08 18:55:56 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-08 18:55:56 -0700 |
commit | a8e46828bf463cf542885d7726310abeac915e0a (patch) | |
tree | ab477227e831803c6f93e539d9ebd4f7bf462cb1 /services/java/com/android/server/PowerManagerService.java | |
parent | 2203fab24966c80af5c37f0a58263218dbbcd610 (diff) | |
parent | c99e6ee202ba9d895c96f034643fd39a035ea7f2 (diff) |
am c99e6ee2: am c9aa32e9: Merge "Fix dumpPowerState method"
* commit 'c99e6ee202ba9d895c96f034643fd39a035ea7f2':
Fix dumpPowerState method
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
-rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 2 |
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 6695cb90d9c1..3bf08a782a8a 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 " : ""); } |