diff options
| author | 2018-05-25 12:57:04 -0700 | |
|---|---|---|
| committer | 2018-05-29 10:31:07 -0700 | |
| commit | d5ee11a531ec0f6bf47ebfe9850a60e3c3e6308f (patch) | |
| tree | e7324c73d6236e9acb0a073406856fb22e91caee | |
| parent | 2e41461725369ee92a03d9037d472db625472c2b (diff) | |
lshal: Released column is now Y/N/?
Y: released
N: unreleased
?: unknown
Test: lshal_test
Change-Id: Ia9d840dd14d07bfbd362bcbc6fe42e58ec5d1d10
| -rw-r--r-- | cmds/lshal/TableEntry.cpp | 7 | ||||
| -rw-r--r-- | cmds/lshal/test.cpp | 20 | ||||
| -rw-r--r-- | libs/binder/include/binder/IInterface.h | 2 |
3 files changed, 16 insertions, 13 deletions
diff --git a/cmds/lshal/TableEntry.cpp b/cmds/lshal/TableEntry.cpp index e8792a4307..f390850e01 100644 --- a/cmds/lshal/TableEntry.cpp +++ b/cmds/lshal/TableEntry.cpp @@ -96,8 +96,11 @@ std::string TableEntry::getField(TableColumnType type) const { std::string TableEntry::isReleased() const { static const std::string unreleased = Hash::hexString(Hash::kEmptyHash); - if (hash.empty() || hash == unreleased) { - return " "; // unknown or unreleased + if (hash.empty()) { + return "?"; + } + if (hash == unreleased) { + return "N"; // unknown or unreleased } return "Y"; // released } diff --git a/cmds/lshal/test.cpp b/cmds/lshal/test.cpp index 3fc957b835..4a9b061b12 100644 --- a/cmds/lshal/test.cpp +++ b/cmds/lshal/test.cpp @@ -460,18 +460,18 @@ TEST_F(ListTest, DumpDefault) { const std::string expected = "[fake description 0]\n" "R Interface Thread Use Server Clients\n" - " a.h.foo1@1.0::IFoo/1 11/21 1 2 4\n" + "N a.h.foo1@1.0::IFoo/1 11/21 1 2 4\n" "Y a.h.foo2@2.0::IFoo/2 12/22 2 3 5\n" "\n" "[fake description 1]\n" "R Interface Thread Use Server Clients\n" - " a.h.foo3@3.0::IFoo/3 N/A N/A 4 6\n" - " a.h.foo4@4.0::IFoo/4 N/A N/A 5 7\n" + "? a.h.foo3@3.0::IFoo/3 N/A N/A 4 6\n" + "? a.h.foo4@4.0::IFoo/4 N/A N/A 5 7\n" "\n" "[fake description 2]\n" "R Interface Thread Use Server Clients\n" - " a.h.foo5@5.0::IFoo/5 N/A N/A 6 8\n" - " a.h.foo6@6.0::IFoo/6 N/A N/A 7 9\n" + "? a.h.foo5@5.0::IFoo/5 N/A N/A 6 8\n" + "? a.h.foo6@6.0::IFoo/6 N/A N/A 7 9\n" "\n"; optind = 1; // mimic Lshal::parseArg() @@ -484,18 +484,18 @@ TEST_F(ListTest, DumpHash) { const std::string expected = "[fake description 0]\n" "Interface R Hash\n" - "a.h.foo1@1.0::IFoo/1 0000000000000000000000000000000000000000000000000000000000000000\n" + "a.h.foo1@1.0::IFoo/1 N 0000000000000000000000000000000000000000000000000000000000000000\n" "a.h.foo2@2.0::IFoo/2 Y 0202020202020202020202020202020202020202020202020202020202020202\n" "\n" "[fake description 1]\n" "Interface R Hash\n" - "a.h.foo3@3.0::IFoo/3 \n" - "a.h.foo4@4.0::IFoo/4 \n" + "a.h.foo3@3.0::IFoo/3 ? \n" + "a.h.foo4@4.0::IFoo/4 ? \n" "\n" "[fake description 2]\n" "Interface R Hash\n" - "a.h.foo5@5.0::IFoo/5 \n" - "a.h.foo6@6.0::IFoo/6 \n" + "a.h.foo5@5.0::IFoo/5 ? \n" + "a.h.foo6@6.0::IFoo/6 ? \n" "\n"; optind = 1; // mimic Lshal::parseArg() diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h index 0f1fe5b670..227d0ae861 100644 --- a/libs/binder/include/binder/IInterface.h +++ b/libs/binder/include/binder/IInterface.h @@ -142,7 +142,7 @@ inline IBinder* BpInterface<INTERFACE>::onAsBinder() { return remote(); } - + // ---------------------------------------------------------------------- }; // namespace android |