Merge "Crushing Dreams." (e0018cc7) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3018,7 +3018,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	}		}

	Runnable mScreenSaverActivator = new Runnable() {		Runnable mScreenSaverActivator = null;
			/*new Runnable() {
	public void run() {		public void run() {
	synchronized (this) {		synchronized (this) {
	if (!(mScreenSaverEnabled && mScreenOn)) {		if (!(mScreenSaverEnabled && mScreenOn)) {
	@@ -3049,9 +3050,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	}		}
	};		};
			*/

	// Must call while holding mLock		// Must call while holding mLock
	private void updateScreenSaverTimeoutLocked() {		private void updateScreenSaverTimeoutLocked() {
			if (mScreenSaverActivator == null) return;

	synchronized (mScreenSaverActivator) {		synchronized (mScreenSaverActivator) {
	mHandler.removeCallbacks(mScreenSaverActivator);		mHandler.removeCallbacks(mScreenSaverActivator);
	if (mScreenSaverEnabled && mScreenOn && mScreenSaverTimeout > 0) {		if (mScreenSaverEnabled && mScreenOn && mScreenSaverTimeout > 0) {