summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-11-06 13:23:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-06 13:23:05 -0800
commitdc2a3f60f2bed20ceb44d18ae03e75d360de4ca6 (patch)
treeac8950630bce047e1ef1528ee146f4eb5ca404ed
parent307fbbf2b6dbdbc9249c492d5569e874207de5b1 (diff)
parentb8933665376905c91069eb29fa78c029aa790ce9 (diff)
downloadframeworks_base-dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6.zip
frameworks_base-dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6.tar.gz
frameworks_base-dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6.tar.bz2
am b8933665: Merge change I3f0ded49 into eclair
Merge commit 'b8933665376905c91069eb29fa78c029aa790ce9' into eclair-mr2 * commit 'b8933665376905c91069eb29fa78c029aa790ce9': Increase light sensor delay from one to two seconds.
-rw-r--r--services/java/com/android/server/PowerManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 270e3cb..2e1cf56 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -91,7 +91,7 @@ class PowerManagerService extends IPowerManager.Stub
private static final int LONG_DIM_TIME = 7000; // t+N-5 sec
// How long to wait to debounce light sensor changes.
- private static final int LIGHT_SENSOR_DELAY = 1000;
+ private static final int LIGHT_SENSOR_DELAY = 2000;
// For debouncing the proximity sensor.
private static final int PROXIMITY_SENSOR_DELAY = 1000;