commit f73f091621381a504c1f9012161b4dda976d792e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 04 19:49:51 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 04 19:49:52 2017 +0000
tree 3f40c91529d82f99beb2abb706edaf8d3f827a6f
parent f81ead0166fddff0152866324643fb0f8569bec0
parent 2edcf9dddc0af9d37c8f7c46599bc01941f85ad7

Merge "Remove toggled transport."

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 51ebdc5..84c9552 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -172,13 +172,8 @@
         out << "::android::vintf::Transport transport = ::android::hardware::getTransport("
             << interfaceName << "::descriptor, serviceName);\n";
 
-        // TODO(b/34274385) remove sysprop check
-        out << "const bool vintfHwbinder = (transport == ::android::vintf::Transport::HWBINDER) ||\n"
-            << "                           (transport == ::android::vintf::Transport::TOGGLED &&\n"
-            << "                            ::android::hardware::details::blockingHalBinderizationEnabled());\n"
-            << "const bool vintfPassthru = (transport == ::android::vintf::Transport::PASSTHROUGH) ||\n"
-            << "                           (transport == ::android::vintf::Transport::TOGGLED &&\n"
-            << "                            !::android::hardware::details::blockingHalBinderizationEnabled());\n"
+        out << "const bool vintfHwbinder = (transport == ::android::vintf::Transport::HWBINDER);\n"
+            << "const bool vintfPassthru = (transport == ::android::vintf::Transport::PASSTHROUGH);\n"
             << "const bool vintfEmpty    = (transport == ::android::vintf::Transport::EMPTY);\n\n";
 
         // if (getStub) {