summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-01-29 19:31:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-29 19:31:10 +0000
commit183a0e52ac3130501c417005f6363eeec62c0afd (patch)
tree4bb7355cfb391b2b94a582ba9e22ce91fd913bd9 /media/libmedia
parent1eda9bfba04043c380666ba1ee86fd285b8ffbca (diff)
parent5bcdfac94a07c55ce021879d733749775d2d8880 (diff)
downloadframeworks_av-183a0e52ac3130501c417005f6363eeec62c0afd.zip
frameworks_av-183a0e52ac3130501c417005f6363eeec62c0afd.tar.gz
frameworks_av-183a0e52ac3130501c417005f6363eeec62c0afd.tar.bz2
am 5bcdfac9: am 2a6e5cf4: Merge "Fix uninitialized variable."
* commit '5bcdfac94a07c55ce021879d733749775d2d8880': Fix uninitialized variable.
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/MidiIoWrapper.cpp4
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;
}