Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Joe Onorato
2010-07-28 10:16:39 -07:00
committed by Android Git Automerger
parent 6fa8888254 0c39b6c65b
commit d3f6c1fa45
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/PowerManagerService.java
View File

@@ -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: {