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

am 1ce4394c: Merge "Throttle userActivity calls from input dispatcher." into gingerbread

Browse Source 
Merge commit '1ce4394c779be5e67e37bbb995da13865b36c573' into gingerbread-plus-aosp

* commit '1ce4394c779be5e67e37bbb995da13865b36c573':
  Throttle userActivity calls from input dispatcher.
This commit is contained in:
Jeff Brown
2010-08-16 20:00:29 -07:00
committed by Android Git Automerger
parent 98a94989dd 1ce4394c77
commit 637df0456f
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/jni/com_android_server_PowerManagerService.cpp
View File

@@ -22,6 +22,7 @@
#include "jni.h" #include "jni.h"
#include <limits.h> #include <limits.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <utils/Timers.h>
#include "com_android_server_PowerManagerService.h" #include "com_android_server_PowerManagerService.h"
namespace android { namespace android {
@@ -43,6 +44,11 @@ static Mutex gPowerManagerLock;
static bool gScreenOn; static bool gScreenOn;
static bool gScreenBright; static bool gScreenBright;
static nsecs_t gLastEventTime[POWER_MANAGER_LAST_EVENT + 1];
// Throttling interval for user activity calls.
static const nsecs_t MIN_TIME_BETWEEN_USERACTIVITIES = 500 * 1000000L; // 500ms
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static bool checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodName) { static bool checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodName) {
@@ -67,6 +73,21 @@ bool android_server_PowerManagerService_isScreenBright() {
void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t eventType) { void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t eventType) {
if (gPowerManagerServiceObj) { if (gPowerManagerServiceObj) {
// Throttle calls into user activity by event type.
// We're a little conservative about argument checking here in case the caller
// passes in bad data which could corrupt system state.
if (eventType >= 0 && eventType <= POWER_MANAGER_LAST_EVENT) {
nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);
if (eventTime > now) {
eventTime = now;
}
if (gLastEventTime[eventType] + MIN_TIME_BETWEEN_USERACTIVITIES > eventTime) {
return;
}
gLastEventTime[eventType] = eventTime;
}
JNIEnv* env = AndroidRuntime::getJNIEnv(); JNIEnv* env = AndroidRuntime::getJNIEnv();
env->CallVoidMethod(gPowerManagerServiceObj, gPowerManagerServiceClassInfo.userActivity, env->CallVoidMethod(gPowerManagerServiceObj, gPowerManagerServiceClassInfo.userActivity,
@@ -136,6 +157,12 @@ int register_android_server_PowerManagerService(JNIEnv* env) {
GET_METHOD_ID(gPowerManagerServiceClassInfo.userActivity, gPowerManagerServiceClassInfo.clazz, GET_METHOD_ID(gPowerManagerServiceClassInfo.userActivity, gPowerManagerServiceClassInfo.clazz,
"userActivity", "(JZIZ)V"); "userActivity", "(JZIZ)V");
// Initialize
for (int i = 0; i < POWER_MANAGER_LAST_EVENT; i++) {
gLastEventTime[i] = LLONG_MIN;
}
gScreenOn = true;
gScreenBright = true;
return 0; return 0;
} }

2
services/jni/com_android_server_PowerManagerService.h
View File

@@ -30,6 +30,8 @@ enum {
POWER_MANAGER_LONG_TOUCH_EVENT = 3, POWER_MANAGER_LONG_TOUCH_EVENT = 3,
POWER_MANAGER_TOUCH_UP_EVENT = 4, POWER_MANAGER_TOUCH_UP_EVENT = 4,
POWER_MANAGER_BUTTON_EVENT = 5, // Button and trackball events. POWER_MANAGER_BUTTON_EVENT = 5, // Button and trackball events.
POWER_MANAGER_LAST_EVENT = POWER_MANAGER_BUTTON_EVENT, // Last valid event code.
}; };
extern bool android_server_PowerManagerService_isScreenOn(); extern bool android_server_PowerManagerService_isScreenOn();