Commit d3f6c1fa authored Jul 28, 2010 by Joe Onorato Committed by Android Git Automerger Jul 28, 2010

am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not...

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

Merge commit '0c39b6c6' into gingerbread-plus-aosp

* commit '0c39b6c6':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.

parents 6fa88882 0c39b6c6

services/java/com/android/server/PowerManagerService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -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: {