commit b8ea23c7a1192687f97c9232f29158b2f9dc8cec
author Etan Cohen <etancohen@google.com> Tue Apr 04 19:50:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 04 19:50:27 2017 +0000
tree 9edd749d1d42601983fabb3d8e6a772f8ca22fb8
parent cb95ee248baebfdf21af85cb74959783b1b2b869
parent 90b4baef525a5fc01aa778a9c0ca364943fc69f9

Merge "[AWARE] Create true translations between legacy and hidl enums" into oc-dev
am: 90b4baef52

Change-Id: If3c80873ef9da35e57254d1411ad127cac833a04

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);