summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-07-28 11:05:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-28 11:05:29 -0700
commit17350886d03ace01de437eacee1e11e4e997f9cb (patch)
treef8e22252f6a27177d98931cb4c997b8150ac2e5b
parentff0aff1914f617e9cb24944e9f9608a86992df72 (diff)
parentd3f6c1fa45d0b9aaf467159953ee4bea2ea89188 (diff)
downloadframeworks_base-17350886d03ace01de437eacee1e11e4e997f9cb.zip
frameworks_base-17350886d03ace01de437eacee1e11e4e997f9cb.tar.gz
frameworks_base-17350886d03ace01de437eacee1e11e4e997f9cb.tar.bz2
am d3f6c1fa: am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
Merge commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188' * commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188': Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
-rw-r--r--services/java/com/android/server/PowerManagerService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index ad910c4..2fb481c 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1052,6 +1052,7 @@ class PowerManagerService extends IPowerManager.Stub
case SCREEN_DIM:
if (mDimDelay >= 0) {
when = now + mDimDelay;
+ break;
} else {
Slog.w(TAG, "mDimDelay=" + mDimDelay + " while trying to dim");
}
@@ -1060,6 +1061,9 @@ class PowerManagerService extends IPowerManager.Stub
when = now + mScreenOffDelay;
}
break;
+ default:
+ when = now;
+ break;
}
} else {
override: {