summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2019-03-28 13:52:39 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-28 13:52:39 -0700
commit8d6d2c44f942467679f0e098c9b26902c4c00f19 (patch)
tree8260175f26805a1dbf6d53e9ee8727bf867c2cb5
parent03cc6a3537e4e2d567cb7c5cdbf134a683db29f2 (diff)
parent8162690b3fed83f2029da8b5998f1f1ff1d12f05 (diff)
downloadextras-8d6d2c44f942467679f0e098c9b26902c4c00f19.tar.gz
Merge "lpdump: log warning message."
am: 8162690b3f Change-Id: Id6b3d5591f558c11e512877ac44a7236b90d7bd9
-rw-r--r--partition_tools/lpdumpd.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/partition_tools/lpdumpd.cc b/partition_tools/lpdumpd.cc
index 83ec60ed..6110f337 100644
--- a/partition_tools/lpdumpd.cc
+++ b/partition_tools/lpdumpd.cc
@@ -50,12 +50,17 @@ class Lpdump : public BnLpdump {
}
LOG(DEBUG) << "Dumping with args: " << base::Join(args, " ");
std::stringstream output;
- int ret = LpdumpMain((int)m_args.size(), argv, output, output);
+ std::stringstream error;
+ int ret = LpdumpMain((int)m_args.size(), argv, output, error);
+ std::string error_str = error.str();
if (ret == 0) {
+ if (!error_str.empty()) {
+ LOG(WARNING) << error_str;
+ }
*aidl_return = output.str();
return Status::ok();
} else {
- return Status::fromServiceSpecificError(ret, output.str().c_str());
+ return Status::fromServiceSpecificError(ret, error_str.c_str());
}
}
};