summaryrefslogtreecommitdiff
path: root/tools/aidl/generate_java_rpc.cpp
diff options
context:
space:
mode:
authorManuel Roman <manuelroman@google.com>2012-05-23 16:00:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-23 16:00:37 -0700
commitbb5a8fd908a53e5d0fdaf84548d3b835b2ccc426 (patch)
tree9269c7f21af63f58bb50f1e8ac69c90eac86f3a0 /tools/aidl/generate_java_rpc.cpp
parent27637173bb815b4cf8684474595d32604753ccba (diff)
parent9d98a089756b692eefeae7f92cca15e121196e0c (diff)
am 9d98a089: Check result handler is not null
* commit '9d98a089756b692eefeae7f92cca15e121196e0c': Check result handler is not null
Diffstat (limited to 'tools/aidl/generate_java_rpc.cpp')
-rw-r--r--tools/aidl/generate_java_rpc.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/aidl/generate_java_rpc.cpp b/tools/aidl/generate_java_rpc.cpp
index e5fa07605f2a..5e4daccf6334 100644
--- a/tools/aidl/generate_java_rpc.cpp
+++ b/tools/aidl/generate_java_rpc.cpp
@@ -786,7 +786,10 @@ generate_result_dispatcher_method(const method_type* method,
}
// Call the callback method
- dispatchMethod->statements->Add(realCall);
+ IfStatement* ifst = new IfStatement;
+ ifst->expression = new Comparison(new FieldVariable(THIS_VALUE, "callback"), "!=", NULL_VALUE);
+ dispatchMethod->statements->Add(ifst);
+ ifst->statements->Add(realCall);
}
static void