commit 180af8d8fba084cff958e2100d60373758b3cbf6
author Ian Pedowitz <ijpedowitz@google.com> Fri Mar 17 20:35:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 17 20:35:05 2017 +0000
tree 6fde7ad02ec171362446bf6bd56eae121b024aaa
parent 5b0a7332c85a0797b2a6f8c6f120616af7e2bd02
parent f34434a6faad29d8f90d6e060c6d11ae7fddeb16

Revert "Cleanup getService" am: 5f009cbdba am: 5c53135064
am: f34434a6fa

Change-Id: I8c276bfb184fa7b4ff9b94e08ce74f557ee043ab

generateCpp.cpp

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";