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 '0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp

* commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.

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 ad910c412c56..2fb481cbc133 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: {