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

Commit 7ea9d79e authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

Make aidl annotate onTransact with @Override 

BUG: 1902262
parent 0781f7ac

tools/aidl/AST.cpp

+6 −2
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ WriteModifiers(FILE* to, int mod, int mask) 
{

    int m = mod & mask;



    if (m & OVERRIDE) {

        fprintf(to, "@Override ");

    }



    if ((m & SCOPE_MASK) == PUBLIC) {

        fprintf(to, "public ");

    }
@@ -79,7 +83,7 @@ Field::Write(FILE* to) 
    if (this->comment.length() != 0) {

        fprintf(to, "%s\n", this->comment.c_str());

    }

    WriteModifiers(to, this->modifiers, SCOPE_MASK | STATIC | FINAL);

    WriteModifiers(to, this->modifiers, SCOPE_MASK | STATIC | FINAL | OVERRIDE);

    fprintf(to, "%s %s", this->variable->type->QualifiedName().c_str(),

            this->variable->name.c_str());

    if (this->value.length() != 0) {
@@ -674,7 +678,7 @@ Method::Write(FILE* to) 
        fprintf(to, "%s\n", this->comment.c_str());

    }



    WriteModifiers(to, this->modifiers, SCOPE_MASK | STATIC | FINAL);

    WriteModifiers(to, this->modifiers, SCOPE_MASK | STATIC | FINAL | OVERRIDE);



    if (this->returnType != NULL) {

        string dim;

tools/aidl/AST.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ enum { 
    FINAL           = 0x00000020,

    ABSTRACT        = 0x00000040,



    OVERRIDE        = 0x00000100,



    ALL_MODIFIERS   = 0xffffffff

};

tools/aidl/generate_java.cpp

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ StubClass::StubClass(Type* type, Type* interfaceType) 
    this->transact_reply = new Variable(PARCEL_TYPE, "reply");

    this->transact_flags = new Variable(INT_TYPE, "flags");

    Method* onTransact = new Method;

        onTransact->modifiers = PUBLIC;

        onTransact->modifiers = PUBLIC | OVERRIDE;

        onTransact->returnType = BOOLEAN_TYPE;

        onTransact->name = "onTransact";

        onTransact->parameters.push_back(this->transact_code);