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

am ace999b0: Ignore attempts to finish events on unregistered channels.

Browse Source 
Merge commit 'ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp

* commit 'ace999b096739d376d4845c0ba94599197ff8477':
  Ignore attempts to finish events on unregistered channels.
This commit is contained in:
Jeff Brown
2010-07-16 16:03:07 -07:00
committed by Android Git Automerger
parent d652751de7 ace999b096
commit e2fb11b9b0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_view_InputQueue.cpp
View File

@@ -413,6 +413,7 @@ static void android_view_InputQueue_nativeRegisterInputChannel(JNIEnv* env, jcla
jobject inputChannelObj, jobject inputHandlerObj, jobject messageQueueObj) { jobject inputChannelObj, jobject inputHandlerObj, jobject messageQueueObj) {
status_t status = gNativeInputQueue.registerInputChannel( status_t status = gNativeInputQueue.registerInputChannel(
env, inputChannelObj, inputHandlerObj, messageQueueObj); env, inputChannelObj, inputHandlerObj, messageQueueObj);
if (status) { if (status) {
jniThrowRuntimeException(env, "Failed to register input channel. " jniThrowRuntimeException(env, "Failed to register input channel. "
"Check logs for details."); "Check logs for details.");
@@ -422,6 +423,7 @@ static void android_view_InputQueue_nativeRegisterInputChannel(JNIEnv* env, jcla
static void android_view_InputQueue_nativeUnregisterInputChannel(JNIEnv* env, jclass clazz, static void android_view_InputQueue_nativeUnregisterInputChannel(JNIEnv* env, jclass clazz,
jobject inputChannelObj) { jobject inputChannelObj) {
status_t status = gNativeInputQueue.unregisterInputChannel(env, inputChannelObj); status_t status = gNativeInputQueue.unregisterInputChannel(env, inputChannelObj);
if (status) { if (status) {
jniThrowRuntimeException(env, "Failed to unregister input channel. " jniThrowRuntimeException(env, "Failed to unregister input channel. "
"Check logs for details."); "Check logs for details.");
@@ -432,7 +434,11 @@ static void android_view_InputQueue_nativeFinished(JNIEnv* env, jclass clazz,
jlong finishedToken) { jlong finishedToken) {
status_t status = gNativeInputQueue.finished( status_t status = gNativeInputQueue.finished(
env, finishedToken, false /*ignoreSpuriousFinish*/); env, finishedToken, false /*ignoreSpuriousFinish*/);
if (status) {
// We ignore the case where an event could not be finished because the input channel
// was no longer registered (DEAD_OBJECT) since it is a common race that can occur
// during application shutdown. The input dispatcher recovers gracefully anyways.
if (status != OK && status != DEAD_OBJECT) {
jniThrowRuntimeException(env, "Failed to finish input event. " jniThrowRuntimeException(env, "Failed to finish input event. "
"Check logs for details."); "Check logs for details.");
} }