commit d04ed08a7c894d2cf54209b408ca673d4e7669a9
author Andreas Huber <andih@google.com> Tue Jul 27 16:49:10 2010 -0700
committer Andreas Huber <andih@google.com> Thu Jul 29 09:25:10 2010 -0700
tree ed53a7a9ed4ee634e6242fd5b82dd76d4a38ebb5
parent 3bf5c4cd30f8bd598842d8ded5f1655406b5c27a

Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.

Change-Id: Ib71113a3bc5aa5fdc088ab4ac3627352499ad3fa

services/java/com/android/server/PowerManagerService.java

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 @@
                         case SCREEN_DIM:
                             if (mDimDelay >= 0) {
                                 when = now + mDimDelay;
+                                break;
                             } else {
                                 Slog.w(TAG, "mDimDelay=" + mDimDelay + " while trying to dim");
                             }
@@ -1052,6 +1053,9 @@
                                 when = now + mScreenOffDelay;
                             }
                             break;
+                        default:
+                            when = now;
+                            break;
                     }
                 } else {
                     override: {