Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb5dfb70 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit 'b14c215e':
  Fewer warnings in aidl generated code.
parents 23734230 b14c215e

tools/aidl/generate_java_binder.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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;