commit 3d76135f949ba1630ab8673555b8ae657a257b9d
author Yifan Hong <elsk@google.com> Tue May 29 12:30:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 29 12:30:21 2018 -0700
tree 0e71f7b8536d536bb5fac2ed3ccca4a82dd0edd2
parent 5b2b7e9192bc72a382867856a4798a8b87f22cc0
parent 0639471d6491a17d8ba787368b47f31f3259438e

Merge changes from topic "lshal_improve"
am: 0639471d64

Change-Id: I9a59f890b5c4c0469c49f0a4ef36c38e4256c5a4

cmds/lshal/ListCommand.cpp

diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index 9c77f70..c0e1a35 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -799,7 +799,7 @@
     mOptions.push_back({'l', "released", no_argument, v++, [](ListCommand* thiz, const char*) {
         thiz->mSelectedColumns.push_back(TableColumnType::RELEASED);
         return OK;
-    }, "print the 'is released?' column\n(Y=released, empty=unreleased or unknown)"});
+    }, "print the 'is released?' column\n(Y=released, N=unreleased, ?=unknown)"});
     mOptions.push_back({'t', "transport", no_argument, v++, [](ListCommand* thiz, const char*) {
         thiz->mSelectedColumns.push_back(TableColumnType::TRANSPORT);
         return OK;

cmds/lshal/TableEntry.cpp

diff --git a/cmds/lshal/TableEntry.cpp b/cmds/lshal/TableEntry.cpp
index 0154a2e..4ad3e92 100644
--- a/cmds/lshal/TableEntry.cpp
+++ b/cmds/lshal/TableEntry.cpp
@@ -34,7 +34,7 @@
     static const std::string sStr64 = "64";
     static const std::string sStr32 = "32";
     static const std::string sStrBoth = "32+64";
-    static const std::string sStrUnknown = "";
+    static const std::string sStrUnknown = "?";
     switch (arch) {
         case vintf::Arch::ARCH_64:
             return sStr64;