diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-17 10:50:55 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-11-17 10:50:55 -0800 |
| commit | 77e79a509d19ab50b1867fe3903b5a8fae450591 (patch) | |
| tree | 881d068bdc54d4835665e48649165f07393caafa /media/libmedia/AudioTrack.cpp | |
| parent | 575174d62b665900203d70a4d410329b8918c2af (diff) | |
| parent | e78a27ca9c701aa996eee0e47fa26dd69d80ffcf (diff) | |
| download | frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.zip frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.tar.gz frameworks_av-77e79a509d19ab50b1867fe3903b5a8fae450591.tar.bz2 | |
resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aosp
Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 2f57b9d..b45a420 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -193,7 +193,7 @@ AudioTrack::~AudioTrack() mAudioTrackThread->requestExitAndWait(); mAudioTrackThread.clear(); } - mAudioTrack->asBinder()->unlinkToDeath(mDeathNotifier, this); + IInterface::asBinder(mAudioTrack)->unlinkToDeath(mDeathNotifier, this); mAudioTrack.clear(); mCblkMemory.clear(); mSharedBuffer.clear(); @@ -1123,7 +1123,7 @@ status_t AudioTrack::createTrack_l() } // invariant that mAudioTrack != 0 is true only after set() returns successfully if (mAudioTrack != 0) { - mAudioTrack->asBinder()->unlinkToDeath(mDeathNotifier, this); + IInterface::asBinder(mAudioTrack)->unlinkToDeath(mDeathNotifier, this); mDeathNotifier.clear(); } mAudioTrack = track; @@ -1226,7 +1226,7 @@ status_t AudioTrack::createTrack_l() mProxy->setMinimum(mNotificationFramesAct); mDeathNotifier = new DeathNotifier(this); - mAudioTrack->asBinder()->linkToDeath(mDeathNotifier, this); + IInterface::asBinder(mAudioTrack)->linkToDeath(mDeathNotifier, this); return NO_ERROR; } |