diff options
| author | Andreas Huber <andih@google.com> | 2010-07-07 09:45:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-07 09:45:38 -0700 |
| commit | c832baa107f36740e462c83e7525ba2e9f01f086 (patch) | |
| tree | 8e8c374be87da68ed6bc0c623770adc5bf0e8dec /include/media | |
| parent | a87843704107d6da82fa64bcab2635a2cacad8b4 (diff) | |
| parent | f5b4e342b581a6e219b49141861b353fb139d00b (diff) | |
| download | frameworks_base-c832baa107f36740e462c83e7525ba2e9f01f086.zip frameworks_base-c832baa107f36740e462c83e7525ba2e9f01f086.tar.gz frameworks_base-c832baa107f36740e462c83e7525ba2e9f01f086.tar.bz2 | |
am f5b4e342: am 2e6aff8e: Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread
Merge commit 'f5b4e342b581a6e219b49141861b353fb139d00b'
* commit 'f5b4e342b581a6e219b49141861b353fb139d00b':
ALooperRoster no longer holds strong references to handlers and loopers.
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/foundation/ALooperRoster.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/stagefright/foundation/ALooperRoster.h b/include/media/stagefright/foundation/ALooperRoster.h index 8f6316e..c1bd4ed 100644 --- a/include/media/stagefright/foundation/ALooperRoster.h +++ b/include/media/stagefright/foundation/ALooperRoster.h @@ -38,8 +38,8 @@ struct ALooperRoster { private: struct HandlerInfo { - sp<ALooper> mLooper; - sp<AHandler> mHandler; + wp<ALooper> mLooper; + wp<AHandler> mHandler; }; Mutex mLock; |