diff options
| author | Joe Onorato <joeo@google.com> | 2010-07-28 09:53:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-28 09:53:12 -0700 |
| commit | 0c39b6c65bcb96ed6438c7d792a67708409d8f0f (patch) | |
| tree | 01bce9458ea87b0d7dbc4e55f0d72eb21f3ca56b | |
| parent | 62d83a0c894b72d9abda1340d278d2aeec11e0fb (diff) | |
| parent | 84047bc295af663274ced27def33164d6e020b5d (diff) | |
| download | frameworks_base-0c39b6c65bcb96ed6438c7d792a67708409d8f0f.zip frameworks_base-0c39b6c65bcb96ed6438c7d792a67708409d8f0f.tar.gz frameworks_base-0c39b6c65bcb96ed6438c7d792a67708409d8f0f.tar.bz2 | |
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 4 |
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 ad910c4..2fb481c 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: { |