commit de81fcb590edb68bc3b3bef33ddcd6391974afa3
author Joe Onorato <joeo@google.com> Wed Sep 14 21:12:28 2011 -0700
committer Mike Lockwood <lockwood@android.com> Fri Oct 28 10:14:50 2011 -0400
tree 032e712c6eb5ab267cb011045f2bb9c7a448220d
parent fc5b4f757f5de3c82b19f6eb854acd3e08f88473

Generate fallthrough for unhandled actions in RPC methods.

Change-Id: I08031c5a89f467691fc02cb4d44e49be3e48ed58

tools/aidl/generate_java_rpc.cpp

diff --git a/tools/aidl/generate_java_rpc.cpp b/tools/aidl/generate_java_rpc.cpp
index 456a950..69e9c3d 100644
--- a/tools/aidl/generate_java_rpc.cpp
+++ b/tools/aidl/generate_java_rpc.cpp
@@ -94,6 +94,7 @@
     bool needed;
     Method* processMethod;
     Variable* actionParam;
+    Variable* requestParam;
     Variable* errorParam;
     Variable* requestData;
     Variable* resultData;
@@ -159,15 +160,15 @@
     this->actionParam = new Variable(STRING_TYPE, "action");
     this->processMethod->parameters.push_back(this->actionParam);
 
-    Variable* requestParam = new Variable(BYTE_TYPE, "requestParam", 1);
-    this->processMethod->parameters.push_back(requestParam);
+    this->requestParam = new Variable(BYTE_TYPE, "requestParam", 1);
+    this->processMethod->parameters.push_back(this->requestParam);
 
     this->errorParam = new Variable(RPC_ERROR_TYPE, "errorParam", 0);
     this->processMethod->parameters.push_back(this->errorParam);
 
     this->requestData = new Variable(RPC_DATA_TYPE, "request");
     this->processMethod->statements->Add(new VariableDeclaration(requestData,
-                new NewExpression(RPC_DATA_TYPE, 1, requestParam)));
+                new NewExpression(RPC_DATA_TYPE, 1, this->requestParam)));
 
     this->resultData = new Variable(RPC_DATA_TYPE, "resultData");
     this->processMethod->statements->Add(new VariableDeclaration(this->resultData,
@@ -193,6 +194,12 @@
 void
 ServiceBaseClass::DoneWithMethods()
 {
+    IfStatement* fallthrough = new IfStatement();
+        fallthrough->statements = new StatementBlock;
+        fallthrough->statements->Add(new ReturnStatement(
+                    new MethodCall(SUPER_VALUE, "process", 3, this->actionParam, this->requestParam,
+                        this->errorParam)));
+    this->dispatchIfStatement->elseif = fallthrough;
     IfStatement* s = new IfStatement;
         s->statements = new StatementBlock;
     this->processMethod->statements->Add(s);