Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b4b4438: am 33c5670b: Merge "Fewer warnings in aidl generated code."

Browse Source 
* commit '4b4b44381b133e9ab7418806c046774b7fd31393':
  Fewer warnings in aidl generated code.
This commit is contained in:
Elliott Hughes
2012-08-07 13:20:50 -07:00
committed by Android Git Automerger
parent 53bec9af8b 4b4b44381b
commit b14c215eb2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/aidl/generate_java_binder.cpp
View File

@@ -54,7 +54,7 @@ StubClass::StubClass(Type* type, Type* interfaceType)
// asBinder // asBinder
Method* asBinder = new Method; Method* asBinder = new Method;
asBinder->modifiers = PUBLIC; asBinder->modifiers = PUBLIC | OVERRIDE;
asBinder->returnType = IBINDER_TYPE; asBinder->returnType = IBINDER_TYPE;
asBinder->name = "asBinder"; asBinder->name = "asBinder";
asBinder->statements = new StatementBlock; asBinder->statements = new StatementBlock;
@@ -117,7 +117,7 @@ StubClass::make_as_interface(Type *interfaceType)
queryLocalInterface->arguments.push_back(new LiteralExpression("DESCRIPTOR")); queryLocalInterface->arguments.push_back(new LiteralExpression("DESCRIPTOR"));
IInterfaceType* iinType = new IInterfaceType(); IInterfaceType* iinType = new IInterfaceType();
Variable *iin = new Variable(iinType, "iin"); Variable *iin = new Variable(iinType, "iin");
VariableDeclaration* iinVd = new VariableDeclaration(iin, queryLocalInterface, iinType); VariableDeclaration* iinVd = new VariableDeclaration(iin, queryLocalInterface, NULL);
m->statements->Add(iinVd); m->statements->Add(iinVd);
// Ensure the instance type of the local object is as expected. // Ensure the instance type of the local object is as expected.
@@ -181,7 +181,7 @@ ProxyClass::ProxyClass(Type* type, InterfaceType* interfaceType)
// IBinder asBinder() // IBinder asBinder()
Method* asBinder = new Method; Method* asBinder = new Method;
asBinder->modifiers = PUBLIC; asBinder->modifiers = PUBLIC | OVERRIDE;
asBinder->returnType = IBINDER_TYPE; asBinder->returnType = IBINDER_TYPE;
asBinder->name = "asBinder"; asBinder->name = "asBinder";
asBinder->statements = new StatementBlock; asBinder->statements = new StatementBlock;
@@ -384,7 +384,7 @@ generate_method(const method_type* method, Class* interface,
// == the proxy method =================================================== // == the proxy method ===================================================
Method* proxy = new Method; Method* proxy = new Method;
proxy->comment = gather_comments(method->comments_token->extra); proxy->comment = gather_comments(method->comments_token->extra);
proxy->modifiers = PUBLIC; proxy->modifiers = PUBLIC | OVERRIDE;
proxy->returnType = NAMES.Search(method->type.type.data); proxy->returnType = NAMES.Search(method->type.type.data);
proxy->returnTypeDimension = method->type.dimension; proxy->returnTypeDimension = method->type.dimension;
proxy->name = method->name.data; proxy->name = method->name.data;