commit 658f011cadc124c25dc2a00cf4be400aa427d374
author Badhri Jagan Sridharan <badhri@google.com> Wed Apr 05 21:19:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 05 21:19:28 2017 +0000
tree a115e86fff96c94e889c32bef1bb8824ab82d248
parent ef8521d6a0d11704bad98a4317eeea03295b1dcd
parent 33fd31e967a16fc9c998712869f2915d357aed47

Merge "USB: HIDL: check the status of registerAsService" into oc-dev
am: 33fd31e967

Change-Id: I687a2bcfb8d401fcc936ebfeda9bfab56dfee83a

bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc

diff --git a/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc b/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc
index 8545d2f..0f76c39 100644
--- a/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc
+++ b/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc
@@ -2,3 +2,4 @@
     class hal
     user bluetooth
     group bluetooth
+    writepid /dev/stune/foreground/tasks

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