diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-12 11:43:55 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-12 11:43:55 -0700 |
| commit | 4710a1f6c9800dae90f9e2702ba2b5b54c095eae (patch) | |
| tree | 094cd3463052fa129012540ce0073705cc62866f /media/libmedia/mediaplayer.cpp | |
| parent | 2a7d5b3c1a3749db7c4ace34bf1253c44967e843 (diff) | |
| parent | 660951867e959ebe98612742ef1f72d33ea7e9a3 (diff) | |
| download | frameworks_av-4710a1f6c9800dae90f9e2702ba2b5b54c095eae.zip frameworks_av-4710a1f6c9800dae90f9e2702ba2b5b54c095eae.tar.gz frameworks_av-4710a1f6c9800dae90f9e2702ba2b5b54c095eae.tar.bz2 | |
am d670b8c6: Merge change 3981 into donut
Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'
* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
Removed trailing whitespaces.
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 0f3eb70..220c998 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -503,7 +503,7 @@ void MediaPlayer::notify(int msg, int ext1, int ext2) // TODO: In the future, we might be on the same thread if the app is // running in the same process as the media server. In that case, // this will deadlock. - // + // // The threadId hack below works around this for the care of prepare // and seekTo within the same process. // FIXME: Remember, this is a hack, it's not even a hack that is applied @@ -511,7 +511,7 @@ void MediaPlayer::notify(int msg, int ext1, int ext2) if (mLockThreadId != getThreadId()) { mLock.lock(); locked = true; - } + } if (mPlayer == 0) { LOGV("notify(%d, %d, %d) callback on disconnected mediaplayer", msg, ext1, ext2); |