diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-04 11:23:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-04 11:23:04 -0700 |
commit | 5887f2199a6285e3af36aaa5e446bcdf2d54f408 (patch) | |
tree | a16b236a2e4a5b44c5faae3d7ea20282c91cb62d /tools/aidl/generate_java.cpp | |
parent | ff14d457c41a8b608ea743e6a04642912436d21e (diff) | |
parent | 747cb3b515e1b01f6b61ec911b693d88d480eaaf (diff) |
am 747cb3b5: Merge change 9670 into donut
Merge commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf'
* commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf':
Make aidl annotate onTransact with @Override
Diffstat (limited to 'tools/aidl/generate_java.cpp')
-rw-r--r-- | tools/aidl/generate_java.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |