summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2017-02-23 21:44:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-23 21:44:51 +0000
commit029dfa78055782c341ca38008b508e2e43ba7ffe (patch)
treed5748d6c44744cc8ecf4cc560918bf02f181706e
parentc297fa5ea465274c64aabfc87e34dc1ead8bbcbf (diff)
parentd14a3dc17049c295d28edf8f3294f5e0ba53afdb (diff)
downloadextras-029dfa78055782c341ca38008b508e2e43ba7ffe.tar.gz
Merge "Use interfaceDescriptor instead of interfaceChain" am: 7e5199f5dd
am: d14a3dc170 Change-Id: I6616e79565ff3cda71199d6055ee77140fe30fdb
-rw-r--r--bootctl/bootctl.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/bootctl/bootctl.cpp b/bootctl/bootctl.cpp
index 6dda28fb..d80bb158 100644
--- a/bootctl/bootctl.cpp
+++ b/bootctl/bootctl.cpp
@@ -52,13 +52,10 @@ static void usage(FILE* where, int /* argc */, char* argv[])
}
static int do_hal_info(const sp<IBootControl> module) {
- module->interfaceChain([&](const auto& chain) {
- if (chain.size() == 0) {
- return; // error, can't dump info
- }
+ module->interfaceDescriptor([&](const auto& descriptor) {
fprintf(stdout,
"HAL Version: %s\n",
- chain[0].c_str());
+ descriptor.c_str());
});
return EX_OK;
}