Merge "hidl-gen: -Lc++-impl omit HIDL reserved methods."
diff --git a/generateCppImpl.cpp b/generateCppImpl.cpp
index b8b91c4..11ec1d6 100644
--- a/generateCppImpl.cpp
+++ b/generateCppImpl.cpp
@@ -51,6 +51,11 @@
                                      const Method *method,
                                      bool specifyNamespaces) const {
 
+    // ignore HIDL reserved methods -- implemented in IFoo already.
+    if (method->isHidlReserved()) {
+        return OK;
+    }
+
     method->generateCppSignature(out, className, specifyNamespaces);
 
     out << " {\n";
@@ -81,6 +86,11 @@
                                           const Method *method,
                                           bool specifyNamespaces) const {
 
+    // ignore HIDL reserved methods -- implemented in IFoo already.
+    if (method->isHidlReserved()) {
+        return OK;
+    }
+
     method->generateCppSignature(out,
                                  className,
                                  specifyNamespaces);