Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 1902

Browse Source 
* changes:
  Throttle one last user activity call to 1/sec that was missed last time
This commit is contained in:
Android (Google) Code Review
2009-05-19 10:52:40 -07:00
parent 93a19f77f5 e10de97205
commit 55cf0cacc6
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/java/com/android/server/WindowManagerService.java
View File

@@ -3721,7 +3721,7 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
private final void wakeupIfNeeded(WindowState targetWin, int eventType) {
long curTime = SystemClock.uptimeMillis();
if (eventType == LONG_TOUCH_EVENT || eventType == CHEEK_EVENT) {
if (eventType == TOUCH_EVENT || eventType == LONG_TOUCH_EVENT || eventType == CHEEK_EVENT) {
if (mLastTouchEventType == eventType &&
(curTime - mLastUserActivityCallTime) < MIN_TIME_BETWEEN_USERACTIVITIES) {
return;
@@ -5194,7 +5194,21 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
} catch (RemoteException e) {
// Ignore
}
mPowerManager.userActivity(curTime, false, eventType, false);
if (eventType != TOUCH_EVENT
&& eventType != LONG_TOUCH_EVENT
&& eventType != CHEEK_EVENT) {
mPowerManager.userActivity(curTime, false,
eventType, false);
} else if (mLastTouchEventType != eventType
|| (curTime - mLastUserActivityCallTime)
>= MIN_TIME_BETWEEN_USERACTIVITIES) {
mLastUserActivityCallTime = curTime;
mLastTouchEventType = eventType;
mPowerManager.userActivity(curTime, false,
eventType, false);
}
switch (ev.classType) {
case RawInputEvent.CLASS_KEYBOARD:
KeyEvent ke = (KeyEvent)ev.event;