commit f0b08a95410c3a441f2cc4381023748bdc41eb24
author Stephen Hines <srhines@google.com> Thu Jan 10 12:18:32 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 10 12:18:32 2019 -0800
tree 6a98c13fb912f68f3d658beea9b981b5dcb6d5d3
parent a9fe8c6e2defd4530d23934a7426f766342eaeab
parent 750fe866e3d57251ea4056927ba2b070f1b6ac56

Merge "NFC: Switch CHECK_INTERFACE to be a more friendly macro statement." am: a7fa269dda am: ab6840e470
am: 750fe866e3

Change-Id: Ia63126c78e88a8541136fca25e6b43ad8da4fc32

libs/binder/include/binder/IInterface.h

diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h
index 5ec02b1..f6381f7 100644
--- a/libs/binder/include/binder/IInterface.h
+++ b/libs/binder/include/binder/IInterface.h
@@ -124,7 +124,9 @@
 
 
 #define CHECK_INTERFACE(interface, data, reply)                         \
-    if (!(data).checkInterface(this)) { return PERMISSION_DENIED; }     \
+    do {                                                                \
+      if (!(data).checkInterface(this)) { return PERMISSION_DENIED; }   \
+    } while (false)                                                     \
 
 
 // ----------------------------------------------------------------------