summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/PowerManagerService.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-05-01 15:54:03 -0700
committerJeff Brown <jeffbrown@google.com>2012-05-01 16:34:20 -0700
commitdaa3753a04699724d2cfe824ac1f5a266d643a05 (patch)
treeddc33d395dd0f3d01a95775397356983fb28a076 /services/java/com/android/server/PowerManagerService.java
parent32c8113510b2774f865e8ac763976b90d9db2706 (diff)
downloadframeworks_base-daa3753a04699724d2cfe824ac1f5a266d643a05.zip
frameworks_base-daa3753a04699724d2cfe824ac1f5a266d643a05.tar.gz
frameworks_base-daa3753a04699724d2cfe824ac1f5a266d643a05.tar.bz2
Improve handling of built-in keyboard.
The window manager policy made some incorrect assumptions about the meaning of the Configuration.keyboard field. We need to be more careful about distinguishing between built-in and external keyboards. Most of this change is to move the determination of the parts of the Configuration related to input devices into the WindowManagerService leveraging new features of the InputManagerService to good effect. Then we plumb through the flag that indicates whether a device is internal or external so that we can be more particular about how the lid switch effects changes to the Configuration. Bug: 6424373 Change-Id: I36a1c22ade35e578955465a25940a33f227b9763
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
-rw-r--r--services/java/com/android/server/PowerManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index bd50e22..5ec1fa5 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2521,8 +2521,8 @@ public class PowerManagerService extends IPowerManager.Stub
return val;
} catch (Exception e) {
// guard against null pointer or index out of bounds errors
- Slog.e(TAG, "Values array must be non-empty and must be the same length "
- + "as the auto-brightness levels array. Check config.xml.", e);
+ Slog.e(TAG, "Values array must be non-empty and must be one element longer than "
+ + "the auto-brightness levels array. Check config.xml.", e);
return 255;
}
}