am 36cf8123: am d278ffc0: am 96e0c315: Merge change Ia3f7ef64 into eclair

Merge commit '36cf8123d8cf9047c64633a963706f40cecc0bb1'

* commit '36cf8123d8cf9047c64633a963706f40cecc0bb1':
  PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
This commit is contained in:
Mike Lockwood
2009-10-22 19:03:50 -07:00
committed by Android Git Automerger

View File

@@ -2007,12 +2007,14 @@ class PowerManagerService extends IPowerManager.Stub
if (mSpew) {
Log.d(TAG, "setKeyboardVisibility: " + visible);
}
mKeyboardVisible = visible;
// 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);
if (mKeyboardVisible != visible) {
mKeyboardVisible = visible;
// 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);
}
}
}
}