-From de8e87c162ad8bdce428421ff000aafe72d7484f Mon Sep 17 00:00:00 2001
+From 644227b8eddffe935adc0e2dde63571f346b046f Mon Sep 17 00:00:00 2001
 From: Ben Turner <bent@silklabs.com>
 Date: Thu, 16 Jun 2016 14:29:54 -0700
 Subject: [PATCH] Android Bluedroid bindings
 
 ---
  Android.mk                        |   7 +
- lib/android/bindings.js           | 837 ++++++++++++++++++++++++++++++++++++++
+ lib/android/bindings.js           | 851 ++++++++++++++++++++++++++++++++++++++
  lib/android/ccc-descriptor.js     | 196 +++++++++
  lib/android/descriptor-wrapper.js |  92 +++++
  lib/bleno.js                      |  20 +-
  lib/characteristic.js             |   2 +
  package.json                      |   6 +-
- 7 files changed, 1149 insertions(+), 11 deletions(-)
+ 7 files changed, 1163 insertions(+), 11 deletions(-)
  create mode 100644 Android.mk
  create mode 100644 lib/android/bindings.js
  create mode 100644 lib/android/ccc-descriptor.js

     "bplist-parser": "0.0.6",
     "xpc-connection": "~0.1.4"
-- 
2.9.2


+BlenoBindings.prototype.onServiceStarted = function(status) {
+  log.debug('onServiceStarted', status);
+
+  if (!this.pendingSetServices) {
+    log.warn('Adapter reset while starting service');
+    return;
+  }
+
+  assert(this.serviceHandle !== null);
+  assert(!this.pendingAttributes);
+
+  this.pendingSetServices = null;
+
+  if (status) {
+    const error = new Error('Failed to start service, status ' + status);
