am 7ce7f633: am fe2bddfa: Don\'t wake up the screen as soon as the lid opens.

Merge commit '7ce7f6333421feed8468d69c920cfe9826e51704'

* commit '7ce7f6333421feed8468d69c920cfe9826e51704':
  Don't wake up the screen as soon as the lid opens.
This commit is contained in:
Dianne Hackborn
2009-09-21 18:38:34 -07:00
committed by Android Git Automerger

View File

@@ -1862,9 +1862,10 @@ class PowerManagerService extends IPowerManager.Stub
Log.d(TAG, "setKeyboardVisibility: " + visible);
}
mKeyboardVisible = visible;
// don't signal user activity when closing keyboard if the screen is off.
// otherwise, we want to make sure the backlights are adjusted.
if (visible || (mPowerState & SCREEN_ON_BIT) != 0) {
// don't signal user activity if the screen is off; other code
// will take care of turning on due to a true change to the lid
// switch and synchronized with the lock screen.
if ((mPowerState & SCREEN_ON_BIT) != 0) {
userActivity(SystemClock.uptimeMillis(), false, BUTTON_EVENT, true);
}
}