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

Author: theandi666

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

@@ -1044,6 +1044,7 @@ private void setTimeoutLocked(long now, long timeoutOverride, int nextState) {
                         case SCREEN_DIM:
                             if (mDimDelay >= 0) {
                                 when = now + mDimDelay;
+                                break;
                             } else {
                                 Slog.w(TAG, "mDimDelay=" + mDimDelay + " while trying to dim");
                             }
@@ -1052,6 +1053,9 @@ private void setTimeoutLocked(long now, long timeoutOverride, int nextState) {
                                 when = now + mScreenOffDelay;
                             }
                             break;
+                        default:
+                            when = now;
+                            break;
                     }
                 } else {
                     override: {