commit 33e64345c9b5994af4b3c1d961280835e67d3d99
author Yifan Hong <elsk@google.com> Tue May 29 12:48:24 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 29 12:48:24 2018 -0700
tree 606075a96d4a38596c1ccf85c95cbbd67e715f8d
parent c724d6ddcb4382502cc39fbcd6e682fc37a6748d
parent e460f4122f43f724778615cfa87c0315d4f7db72

Merge changes from topic "lshal_improve" am: 0639471d64 am: 3d76135f94
am: e460f4122f

Change-Id: I4664c200219057cf20d24c60b1a138ee1a3a1c8b

cmds/lshal/ListCommand.cpp

diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index 59b0776..92e9151 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;