commit 9a7822497fa38539fdf9dacc6860c436e2925251
author Joe Onorato <joeo@google.com> Sun Oct 23 15:15:27 2011 -0700
committer Joe Onorato <joeo@google.com> Sun Oct 23 19:11:40 2011 -0700
tree 102da67fb3d8a8c0f5b08b64ee4f9ce553c9e972
parent 6937988227359c154b65c2e476918ac47f7fb392

The API doesn't need a container here, all it needs is a Context.

Change-Id: Id270a8cf4ce3b30dd470a5e11b966aaa14fb70c0

tools/aidl/generate_java_rpc.cpp

diff --git a/tools/aidl/generate_java_rpc.cpp b/tools/aidl/generate_java_rpc.cpp
index e4867e4..852b0c1 100644
--- a/tools/aidl/generate_java_rpc.cpp
+++ b/tools/aidl/generate_java_rpc.cpp
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-Type* SERVICE_CONTEXT_TYPE = new Type("android.content",
+Type* ANDROID_CONTEXT_TYPE = new Type("android.content",
         "Context", Type::BUILT_IN, false, false, false);
 Type* PRESENTER_BASE_TYPE = new Type("com.android.athome.connector",
         "EventListener", Type::BUILT_IN, false, false, false);
@@ -13,8 +13,6 @@
         "EventListener.Listener", Type::BUILT_IN, false, false, false);
 Type* RPC_BROKER_TYPE = new Type("com.android.athome.connector", "Broker",
         Type::BUILT_IN, false, false, false);
-Type* RPC_CONTAINER_TYPE = new Type("com.android.athome.connector", "ConnectorContainer",
-        Type::BUILT_IN, false, false, false);
 // TODO: Just use Endpoint, so this works for all endpoints.
 Type* RPC_CONNECTOR_TYPE = new Type("com.android.athome.connector", "Connector",
         Type::BUILT_IN, false, false, false);
@@ -458,7 +456,7 @@
 void
 EndpointBaseClass::generate_ctor()
 {
-    Variable* container = new Variable(RPC_CONTAINER_TYPE, "container");
+    Variable* container = new Variable(ANDROID_CONTEXT_TYPE, "context");
     Variable* broker = new Variable(RPC_BROKER_TYPE, "broker");
     Method* ctor = new Method;
         ctor->modifiers = PUBLIC;