summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-07-27 16:49:10 -0700
committerAndreas Huber <andih@google.com>2010-07-29 09:25:10 -0700
commitd04ed08a7c894d2cf54209b408ca673d4e7669a9 (patch)
treeed53a7a9ed4ee634e6242fd5b82dd76d4a38ebb5
parent3bf5c4cd30f8bd598842d8ded5f1655406b5c27a (diff)
downloadframeworks_base-d04ed08a7c894d2cf54209b408ca673d4e7669a9.zip
frameworks_base-d04ed08a7c894d2cf54209b408ca673d4e7669a9.tar.gz
frameworks_base-d04ed08a7c894d2cf54209b408ca673d4e7669a9.tar.bz2
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 ffdc8b2..7bbc32f 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: {