From b327c41e125a3be15a6c6c4dba318fe1b2392605 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 7 Aug 2012 10:34:02 -0700 Subject: Fewer warnings in aidl generated code. Bug: http://code.google.com/p/android/issues/detail?id=19196 Change-Id: If054e60c19dc73fe32f55d0fa1054309565a6de6 --- tools/aidl/generate_java_binder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/aidl') diff --git a/tools/aidl/generate_java_binder.cpp b/tools/aidl/generate_java_binder.cpp index 2e459a8..f80a388 100644 --- a/tools/aidl/generate_java_binder.cpp +++ b/tools/aidl/generate_java_binder.cpp @@ -54,7 +54,7 @@ StubClass::StubClass(Type* type, Type* interfaceType) // asBinder Method* asBinder = new Method; - asBinder->modifiers = PUBLIC; + asBinder->modifiers = PUBLIC | OVERRIDE; asBinder->returnType = IBINDER_TYPE; asBinder->name = "asBinder"; asBinder->statements = new StatementBlock; @@ -117,7 +117,7 @@ StubClass::make_as_interface(Type *interfaceType) queryLocalInterface->arguments.push_back(new LiteralExpression("DESCRIPTOR")); IInterfaceType* iinType = new IInterfaceType(); Variable *iin = new Variable(iinType, "iin"); - VariableDeclaration* iinVd = new VariableDeclaration(iin, queryLocalInterface, iinType); + VariableDeclaration* iinVd = new VariableDeclaration(iin, queryLocalInterface, NULL); m->statements->Add(iinVd); // Ensure the instance type of the local object is as expected. @@ -181,7 +181,7 @@ ProxyClass::ProxyClass(Type* type, InterfaceType* interfaceType) // IBinder asBinder() Method* asBinder = new Method; - asBinder->modifiers = PUBLIC; + asBinder->modifiers = PUBLIC | OVERRIDE; asBinder->returnType = IBINDER_TYPE; asBinder->name = "asBinder"; asBinder->statements = new StatementBlock; @@ -384,7 +384,7 @@ generate_method(const method_type* method, Class* interface, // == the proxy method =================================================== Method* proxy = new Method; proxy->comment = gather_comments(method->comments_token->extra); - proxy->modifiers = PUBLIC; + proxy->modifiers = PUBLIC | OVERRIDE; proxy->returnType = NAMES.Search(method->type.type.data); proxy->returnTypeDimension = method->type.dimension; proxy->name = method->name.data; -- cgit v1.1