am 747cb3b5: Merge change 9670 into donut

Merge commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf'

* commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf':
  Make aidl annotate onTransact with @Override

3 files changed, 9 insertions, 3 deletions

diff --git a/tools/aidl/AST.cpp b/tools/aidl/AST.cpp
index 1856cb9d093a..752ef7cc8480 100755
--- a/tools/aidl/AST.cpp
+++ b/tools/aidl/AST.cpp
@@ -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;
diff --git a/tools/aidl/AST.h b/tools/aidl/AST.h
index aec21644bf6b..315635650a64 100755
--- a/tools/aidl/AST.h
+++ b/tools/aidl/AST.h
@@ -22,6 +22,8 @@ enum {
     FINAL           = 0x00000020,
     ABSTRACT        = 0x00000040,
 
+    OVERRIDE        = 0x00000100,
+
     ALL_MODIFIERS   = 0xffffffff
 };
 
diff --git a/tools/aidl/generate_java.cpp b/tools/aidl/generate_java.cpp
index da20d1f7ef87..0f18132fc82e 100644
--- a/tools/aidl/generate_java.cpp
+++ b/tools/aidl/generate_java.cpp
@@ -104,7 +104,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);