Merge change Ia3f7ef64 into eclair
* changes: PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
This commit is contained in:
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user