summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-07-27 16:49:10 -0700
committerandroid-build SharedAccount <android-build@sekiwake.mtv.corp.google.com>2010-08-20 09:20:39 -0700
commit8812535137ca657f6830dd01189c429bdb13c237 (patch)
treebdbcbc5079c2694378ac1828df4e9b4632271e1a
parentb9f1c70a88046c97453d79c7a41c4b493d4d5ed5 (diff)
downloadbase-8812535137ca657f6830dd01189c429bdb13c237.tar.gz
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Change-Id: Ib71113a3bc5aa5fdc088ab4ac3627352499ad3fa
-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 ffdc8b2a170a..7bbc32ffec28 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1044,6 +1044,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");
}
@@ -1052,6 +1053,9 @@ class PowerManagerService extends IPowerManager.Stub
when = now + mScreenOffDelay;
}
break;
+ default:
+ when = now;
+ break;
}
} else {
override: {