commit 231653e95d7343481b343d2d25e70ae8937ee77e
author Steven Moreland <smoreland@google.com> Wed Feb 22 03:59:24 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 22 03:59:24 2017 +0000
tree 0df0fb75315bbfdef4a60ec0a03194f7a50b0579
parent b9ad8c49766cc2682015a75cc42c59e3df0c346f
parent 20bd4b508cddd60818822ff2f71d1082bb0de477

Merge "Remove unused includes."

media/libaudiohal/DevicesFactoryHalHidl.cpp

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.

media/libaudiohal/EffectsFactoryHalHidl.cpp

diff --git a/media/libaudiohal/EffectsFactoryHalHidl.cpp b/media/libaudiohal/EffectsFactoryHalHidl.cpp
index 0ec9f9e..6ad23bc 100644
--- a/media/libaudiohal/EffectsFactoryHalHidl.cpp
+++ b/media/libaudiohal/EffectsFactoryHalHidl.cpp
@@ -45,8 +45,8 @@
     return EffectIsNullUuid(pEffectUuid);
 }
 
-EffectsFactoryHalHidl::EffectsFactoryHalHidl() : ConversionHelperHidl("EffectsFactory"){
-    mEffectsFactory = IEffectsFactory::getService("audio_effects_factory");
+EffectsFactoryHalHidl::EffectsFactoryHalHidl() : ConversionHelperHidl("EffectsFactory") {
+    mEffectsFactory = IEffectsFactory::getService();
     // TODO: Waiting should not be needed (b/34772726).
     // Also remove include of IAllocator.h and ServiceManagement.h
     android::hardware::details::waitForHwService(

media/mtp/MtpFfsHandle.cpp

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) {

media/mtp/MtpServer.cpp

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);