commit 750fe866e3d57251ea4056927ba2b070f1b6ac56
author Stephen Hines <srhines@google.com> Thu Jan 10 11:58:36 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 10 11:58:36 2019 -0800
tree ca2831f631833769a8e330e56d6e75e09bea19ef
parent 2521ef089027134a9fe5de4d3da26c7ff14a7f3b
parent ab6840e470490685deb24086c44b8ccc5dc416f2

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

Change-Id: Ie6c8249a552039bf2d1de588529e9464338d3f67

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)                                                     \
 
 
 // ----------------------------------------------------------------------