diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-03 12:38:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-03 12:38:35 -0700 |
| commit | 637854c9b5bf087f1e261313d245ab3b544e1cf8 (patch) | |
| tree | 814ec3cc87cdeb78ee1950705d7ba41ecf4b17ab /services | |
| parent | c04271b7e86f5cb0bf084f4fb456c5aa580398a4 (diff) | |
| parent | 251faa625002088c2d1b2387b5dc1fcb7e5a341d (diff) | |
| download | frameworks_base-637854c9b5bf087f1e261313d245ab3b544e1cf8.zip frameworks_base-637854c9b5bf087f1e261313d245ab3b544e1cf8.tar.gz frameworks_base-637854c9b5bf087f1e261313d245ab3b544e1cf8.tar.bz2 | |
Merge change 9512
* changes:
Display a helpful label for PROXIMITY_SCREEN_OFF_WAKE_LOCKs in the output of "dumpsys power".
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index a3c3436..447e9fa 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -765,15 +765,17 @@ class PowerManagerService extends IPowerManager.Stub switch (type) { case PowerManager.FULL_WAKE_LOCK: - return "FULL_WAKE_LOCK "; + return "FULL_WAKE_LOCK "; case PowerManager.SCREEN_BRIGHT_WAKE_LOCK: - return "SCREEN_BRIGHT_WAKE_LOCK"; + return "SCREEN_BRIGHT_WAKE_LOCK "; case PowerManager.SCREEN_DIM_WAKE_LOCK: - return "SCREEN_DIM_WAKE_LOCK "; + return "SCREEN_DIM_WAKE_LOCK "; case PowerManager.PARTIAL_WAKE_LOCK: - return "PARTIAL_WAKE_LOCK "; + return "PARTIAL_WAKE_LOCK "; + case PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK: + return "PROXIMITY_SCREEN_OFF_WAKE_LOCK"; default: - return "??? "; + return "??? "; } } |