diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-29 19:24:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 19:24:47 +0000 |
| commit | 5bcdfac94a07c55ce021879d733749775d2d8880 (patch) | |
| tree | 73983f25a727778828f588e4ef22dcb418799999 /media | |
| parent | a3c9d5c3982591042c7c6cb5fb7c32fbd4765832 (diff) | |
| parent | 2a6e5cf4e8b39e3b0b540d3cf49568c61e9d67cd (diff) | |
| download | frameworks_av-5bcdfac94a07c55ce021879d733749775d2d8880.zip frameworks_av-5bcdfac94a07c55ce021879d733749775d2d8880.tar.gz frameworks_av-5bcdfac94a07c55ce021879d733749775d2d8880.tar.bz2 | |
am 2a6e5cf4: Merge "Fix uninitialized variable."
* commit '2a6e5cf4e8b39e3b0b540d3cf49568c61e9d67cd':
Fix uninitialized variable.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/MidiIoWrapper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmedia/MidiIoWrapper.cpp b/media/libmedia/MidiIoWrapper.cpp index 2181111..5197ce2 100644 --- a/media/libmedia/MidiIoWrapper.cpp +++ b/media/libmedia/MidiIoWrapper.cpp @@ -48,6 +48,8 @@ MidiIoWrapper::MidiIoWrapper(int fd, off64_t offset, int64_t size) { } MidiIoWrapper::MidiIoWrapper(const sp<DataSource> &source) { + ALOGV("MidiIoWrapper(DataSource)"); + mFd = -1; mDataSource = source; off64_t l; if (mDataSource->getSize(&l) == OK) { @@ -76,7 +78,7 @@ int MidiIoWrapper::readAt(void *buffer, int offset, int size) { } int MidiIoWrapper::size() { - ALOGV("size() = %d", mLength); + ALOGV("size() = %d", int(mLength)); return mLength; } |