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

2010-07-30 08:05:56 -07:00
parent 27eecb704a d04ed08a7c
commit 7f9fe5fdfa
1 changed files with 4 additions and 0 deletions
--- 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: {