commit d366c263ec345954a2d6f05246de615a306145ce
author Steven Moreland <smoreland@google.com> Tue Oct 11 15:29:10 2016 -0700
committer Steven Moreland <smoreland@google.com> Tue Oct 11 18:02:15 2016 -0700
tree 424f165c8cf7dad1df594aa4138d46ca9961ffe2
parent ef1a9feda3f09f87f0673cc978b36e1d4a8b4223

Fix passthrough name collision.

Test: make, make interfaces
Change-Id: Ia11e0788f28456cb4f4f16e946bbead19d21244b

generateCpp.cpp

diff --git a/generateCpp.cpp b/generateCpp.cpp
index 7ec8e7f..c514714 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -1611,7 +1611,7 @@
         out.unindent();
         out << "}\n";
 
-        out << "return Status();\n";
+        out << "return ::android::hardware::Status();\n";
 
         out.unindent();
         out << "}\n\n";