commit d7b26c6d1c68d74f15add6dde25c3e2a8d9bbd3b
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 04 22:27:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 04 22:27:54 2017 +0000
tree b440a1aecd2c43c07bde2d19f8b445233417427b
parent b8ea23c7a1192687f97c9232f29158b2f9dc8cec
parent ae880e49225d29f27a507814db5805f1a0357f45

Merge "Revert "camera: Map between legacy gralloc0 usage, and HIDL gralloc1 usages"" into oc-dev
am: ae880e4922

Change-Id: Ic82a3c73e6de95c5f4dfc53a0cb530e499e2a377

bluetooth/1.0/default/vendor_interface.cc

diff --git a/bluetooth/1.0/default/vendor_interface.cc b/bluetooth/1.0/default/vendor_interface.cc
index 68cac5f..bb66460 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -16,8 +16,6 @@
 
 #include "vendor_interface.h"
 
-#include <assert.h>
-
 #define LOG_TAG "android.hardware.bluetooth@1.0-impl"
 #include <android-base/logging.h>
 #include <cutils/properties.h>
@@ -165,7 +163,7 @@
     InitializeCompleteCallback initialize_complete_cb,
     PacketReadCallback event_cb, PacketReadCallback acl_cb,
     PacketReadCallback sco_cb) {
-  assert(!g_vendor_interface);
+  CHECK(!g_vendor_interface);
   g_vendor_interface = new VendorInterface();
   return g_vendor_interface->Open(initialize_complete_cb, event_cb, acl_cb,
                                   sco_cb);