summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2019-03-28 14:19:21 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-28 14:19:21 -0700
commit44f0f660e22ac4903031ea802c852633ab7c2eba (patch)
treedab955dfb0f802a4906fc7aa499803909fa6b4f7
parent61962565ec768372867df51c6526103cced5523a (diff)
parent00c0df0574560d565d90f9a21f659ad12b57fe48 (diff)
downloadextras-44f0f660e22ac4903031ea802c852633ab7c2eba.tar.gz
Merge "lpdump: log warning message." am: 8162690b3f am: 8d6d2c44f9
am: 00c0df0574 Change-Id: Ifd5d71ad745b99d0a921932fb24ab0aa9a10a2bc
-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());
}
}
};