diff options
author | Andreas Huber <andih@google.com> | 2010-10-19 09:55:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 09:55:31 -0700 |
commit | a3764dee0d52e65d16005a411e2d4efd0af20953 (patch) | |
tree | 90537385042af61eba244a053a0fedccf7b2b3af /media | |
parent | 2ad46bea6b7ef92b24e9bd98b0b459beb71b96ab (diff) | |
parent | 475c5fabc59a86eb667f3afb4b1523f9b98797e3 (diff) | |
download | frameworks_av-a3764dee0d52e65d16005a411e2d4efd0af20953.zip frameworks_av-a3764dee0d52e65d16005a411e2d4efd0af20953.tar.gz frameworks_av-a3764dee0d52e65d16005a411e2d4efd0af20953.tar.bz2 |
am 8b5161c2: am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.
Merge commit '8b5161c2aed8637de9bffb1d81298d60ea237caf'
* commit '8b5161c2aed8637de9bffb1d81298d60ea237caf':
An attempt to unregister a handler that's no longer registered should not cause an assertion.
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/foundation/ALooperRoster.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/libstagefright/foundation/ALooperRoster.cpp b/media/libstagefright/foundation/ALooperRoster.cpp index 7683113..8aa1b15 100644 --- a/media/libstagefright/foundation/ALooperRoster.cpp +++ b/media/libstagefright/foundation/ALooperRoster.cpp @@ -54,7 +54,10 @@ void ALooperRoster::unregisterHandler(ALooper::handler_id handlerID) { Mutex::Autolock autoLock(mLock); ssize_t index = mHandlers.indexOfKey(handlerID); - CHECK_GE(index, 0); + + if (index < 0) { + return; + } const HandlerInfo &info = mHandlers.valueAt(index); @@ -84,7 +87,8 @@ void ALooperRoster::postMessage( if (looper == NULL) { LOGW("failed to post message. " - "Target handler still registered, but object gone."); + "Target handler %d still registered, but object gone.", + msg->target()); mHandlers.removeItemsAt(index); return; @@ -111,7 +115,8 @@ void ALooperRoster::deliverMessage(const sp<AMessage> &msg) { if (handler == NULL) { LOGW("failed to deliver message. " - "Target handler registered, but object gone."); + "Target handler %d registered, but object gone.", + msg->target()); mHandlers.removeItemsAt(index); return; |