summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stephen Hines <srhines@google.com> 2019-01-10 11:50:56 -0800
committer android-build-merger <android-build-merger@google.com> 2019-01-10 11:50:56 -0800
commitab6840e470490685deb24086c44b8ccc5dc416f2 (patch)
tree7ad1f61e0d441f216e6db3ed0c5461e0266430e7
parentfaec550a586b1919535596719280fead703576ec (diff)
parenta7fa269ddaf4ee156bbe4796f0e77541d1283f98 (diff)
Merge "NFC: Switch CHECK_INTERFACE to be a more friendly macro statement."
am: a7fa269dda Change-Id: I865b0ed4a033d20e4018eace91a076ffcab789b2
-rw-r--r--libs/binder/include/binder/IInterface.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h
index 5ec02b1df3..f6381f7bc3 100644
--- a/libs/binder/include/binder/IInterface.h
+++ b/libs/binder/include/binder/IInterface.h
@@ -124,7 +124,9 @@ public: \
#define CHECK_INTERFACE(interface, data, reply) \
- if (!(data).checkInterface(this)) { return PERMISSION_DENIED; } \
+ do { \
+ if (!(data).checkInterface(this)) { return PERMISSION_DENIED; } \
+ } while (false) \
// ----------------------------------------------------------------------