diff options
| author | Andreas Huber <andih@google.com> | 2010-07-30 08:05:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-30 08:05:56 -0700 |
| commit | 7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6 (patch) | |
| tree | f48c4878fe5c5c5019f02b8255e52474537b7f26 /services/java | |
| parent | 27eecb704a27c1c73ed3449eba0307d8138b9c2e (diff) | |
| parent | d04ed08a7c894d2cf54209b408ca673d4e7669a9 (diff) | |
| download | frameworks_base-7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6.zip frameworks_base-7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6.tar.gz frameworks_base-7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6.tar.bz2 | |
Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Diffstat (limited to 'services/java')
| -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 ffdc8b2..7bbc32f 100644 --- 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: { |