Revert "Cleanup getService"
am: 5f009cbdba
Change-Id: I78bcaed41f48f798562c1be81639133014149581
diff --git a/generateCpp.cpp b/generateCpp.cpp
index 55ea0d1..a3c9a78 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -187,8 +187,13 @@
// }
// }
- out << "bool tried = false;\n";
- out.sWhile("!getStub && (vintfHwbinder || (vintfEmpty && !tried))", [&] {
+ out.sFor("bool tried = false; "
+ "!getStub && (vintfHwbinder || (vintfEmpty && !tried)); "
+ "tried = true", [&] {
+
+ // Because this is a for loop, a "continue" statement means
+ // setting tried, and hence "break" for vintfEmpty and
+ // "retry" for vintfHwBinder
out.sIf("tried", [&] {
// sleep only after the first trial.
@@ -196,8 +201,6 @@
<< "sleep(1);\n";
}).endl();
- out << "tried = true;\n";
-
out << "const ::android::sp<::android::hidl::manager::V1_0::IServiceManager> sm\n";
out.indent(2, [&] {
out << "= ::android::hardware::defaultServiceManager();\n";