Merge "audio_effects HAL uses "default" service name"
diff --git a/media/libaudiohal/DevicesFactoryHalHidl.cpp b/media/libaudiohal/DevicesFactoryHalHidl.cpp
index b0f28b9..9cbe018 100644
--- a/media/libaudiohal/DevicesFactoryHalHidl.cpp
+++ b/media/libaudiohal/DevicesFactoryHalHidl.cpp
@@ -40,7 +40,7 @@
}
DevicesFactoryHalHidl::DevicesFactoryHalHidl() {
- mDevicesFactory = IDevicesFactory::getService("audio_devices_factory");
+ mDevicesFactory = IDevicesFactory::getService();
if (mDevicesFactory != 0) {
// It is assumet that DevicesFactory is owned by AudioFlinger
// and thus have the same lifespan.
diff --git a/media/mtp/MtpFfsHandle.cpp b/media/mtp/MtpFfsHandle.cpp
index 6c7ffcb..58d2bb8 100644
--- a/media/mtp/MtpFfsHandle.cpp
+++ b/media/mtp/MtpFfsHandle.cpp
@@ -641,6 +641,7 @@
if (file_length == static_cast<unsigned>(init_read_len)) return 0;
file_length -= init_read_len;
offset += init_read_len;
+ ret = 0;
// Break down the file into pieces that fit in buffers
while(file_length > 0) {
diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index 753d833..5a1d6dc 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -1060,6 +1060,9 @@
mfr.length = mSendObjectFileSize - initialData;
}
+ mfr.command = 0;
+ mfr.transaction_id = 0;
+
// transfer the file
ret = sHandle->receiveFile(mfr);
if ((ret < 0) && (errno == ECANCELED)) {
@@ -1257,6 +1260,8 @@
mfr.fd = edit->mFD;
mfr.offset = offset;
mfr.length = length;
+ mfr.command = 0;
+ mfr.transaction_id = 0;
// transfer the file
ret = sHandle->receiveFile(mfr);