commit bd529ccdea7b7e29b0bb7ef60dcce3d2d0052dc9
author Janis Danisevskis <jdanis@google.com> Wed Apr 05 01:20:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 05 01:20:40 2017 +0000
tree 23b539d86a4dc9a5e453e42fce384a59db33fe0c
parent d7b26c6d1c68d74f15add6dde25c3e2a8d9bbd3b
parent 0dff6286ebab52f7f0d675e9474fdd5c7ac498bf

Merge "Add DeleteKey and DeleteAllKeys test to Keymaster VTS tests" into oc-dev
am: 0dff6286eb

Change-Id: I00514c09d2fe5b6de27b3c0597641acb831c9930

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