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

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

Browse Source
This commit is contained in:
Andreas Huber
2010-07-30 08:05:56 -07:00
committed by Android (Google) Code Review
parent 27eecb704a d04ed08a7c
commit 7f9fe5fdfa
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

@@ -1044,6 +1044,7 @@ class PowerManagerService extends IPowerManager.Stub
case SCREEN_DIM: case SCREEN_DIM:
if (mDimDelay >= 0) { if (mDimDelay >= 0) {
when = now + mDimDelay; when = now + mDimDelay;
break;
} else { } else {
Slog.w(TAG, "mDimDelay=" + mDimDelay + " while trying to dim"); Slog.w(TAG, "mDimDelay=" + mDimDelay + " while trying to dim");
} }
@@ -1052,6 +1053,9 @@ class PowerManagerService extends IPowerManager.Stub
when = now + mScreenOffDelay; when = now + mScreenOffDelay;
} }
break; break;
default:
when = now;
break;
} }
} else { } else {
override: { override: {