diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-09-27 20:46:43 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-09-27 21:42:57 -0700 |
| commit | bcc046af4ef171aa3aa3c6b64efb5cafc1e46cd3 (patch) | |
| tree | 497724ac54d4a380b5f466ea48a3a96265446754 /services/jni | |
| parent | 580ee8b0c6e1aea1e2e1d60499b603b9168b44f0 (diff) | |
| download | frameworks_base-bcc046af4ef171aa3aa3c6b64efb5cafc1e46cd3.zip frameworks_base-bcc046af4ef171aa3aa3c6b64efb5cafc1e46cd3.tar.gz frameworks_base-bcc046af4ef171aa3aa3c6b64efb5cafc1e46cd3.tar.bz2 | |
Bundle correlated switch changes atomically.
This is a prerequisite for headset jack detection on Manta.
Bug: 6548391
Change-Id: I549a194344511c0cee578b00f6a9ab5fdbdfb99c
Diffstat (limited to 'services/jni')
| -rw-r--r-- | services/jni/com_android_server_input_InputManagerService.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/jni/com_android_server_input_InputManagerService.cpp b/services/jni/com_android_server_input_InputManagerService.cpp index 319cacd..a97becf 100644 --- a/services/jni/com_android_server_input_InputManagerService.cpp +++ b/services/jni/com_android_server_input_InputManagerService.cpp @@ -187,7 +187,7 @@ public: /* --- InputDispatcherPolicyInterface implementation --- */ - virtual void notifySwitch(nsecs_t when, int32_t switchCode, int32_t switchValue, + virtual void notifySwitch(nsecs_t when, uint32_t switchValues, uint32_t switchMask, uint32_t policyFlags); virtual void notifyConfigurationChanged(nsecs_t when); virtual nsecs_t notifyANR(const sp<InputApplicationHandle>& inputApplicationHandle, @@ -527,17 +527,17 @@ String8 NativeInputManager::getDeviceAlias(const InputDeviceIdentifier& identifi return result; } -void NativeInputManager::notifySwitch(nsecs_t when, int32_t switchCode, - int32_t switchValue, uint32_t policyFlags) { +void NativeInputManager::notifySwitch(nsecs_t when, + uint32_t switchValues, uint32_t switchMask, uint32_t policyFlags) { #if DEBUG_INPUT_DISPATCHER_POLICY - ALOGD("notifySwitch - when=%lld, switchCode=%d, switchValue=%d, policyFlags=0x%x", - when, switchCode, switchValue, policyFlags); + ALOGD("notifySwitch - when=%lld, switchValues=0x%08x, switchMask=0x%08x, policyFlags=0x%x", + when, switchValues, switchMask, policyFlags); #endif JNIEnv* env = jniEnv(); env->CallVoidMethod(mServiceObj, gServiceClassInfo.notifySwitch, - when, switchCode, switchValue); + when, switchValues, switchMask); checkAndClearExceptionFromCallback(env, "notifySwitch"); } |