diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-08-20 15:46:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 15:46:07 -0700 |
| commit | 6a8ea471a9f3b001bd0ffa3381eba12975dfc59f (patch) | |
| tree | 3590178bb20b7042efdaca9f7f87822f7ea1968a /include | |
| parent | 3411fc2f3a44b22d69a359a3eb26f756d6116e4f (diff) | |
| parent | a997e7a7c5aa2fc7e95316218316f8b7b98786ba (diff) | |
| download | frameworks_av-6a8ea471a9f3b001bd0ffa3381eba12975dfc59f.zip frameworks_av-6a8ea471a9f3b001bd0ffa3381eba12975dfc59f.tar.gz frameworks_av-6a8ea471a9f3b001bd0ffa3381eba12975dfc59f.tar.bz2 | |
Merge "Revert "Swap the order of creating IAudioTrack and thread"" into jb-mr1-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 4488ce4..26a25b0 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -473,7 +473,7 @@ protected: friend class AudioTrack; virtual bool threadLoop(); AudioTrack& mReceiver; - virtual ~AudioTrackThread(); + ~AudioTrackThread(); Mutex mMyLock; // Thread::mLock is private Condition mMyCond; // Thread::mThreadExitedCondition is private bool mPaused; // whether thread is currently paused |