tequilaOS/platform_frameworks_native
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lshal: Released column is now Y/N/?

Browse source 
Y: released
N: unreleased
?: unknown

Test: lshal_test

Change-Id: Ia9d840dd14d07bfbd362bcbc6fe42e58ec5d1d10
This commit is contained in:
Yifan Hong 2018-05-25 12:57:04 -07:00
parent 2e41461725
commit d5ee11a531
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmds/lshal/TableEntry.cpp
View file

@ -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
}

20
cmds/lshal/test.cpp
View file

@ -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()

2
libs/binder/include/binder/IInterface.h
View file

@ -142,7 +142,7 @@ inline IBinder* BpInterface<INTERFACE>::onAsBinder()
{
return remote();
}
// ----------------------------------------------------------------------
}; // namespace android