When local device originated connection to hid device, move out of quiet mode
bug 17480992
Change-Id: Ia3f5ef4886dfde370abe5b35a80ab80a4f030f37
diff --git a/src/com/android/bluetooth/hid/HidService.java b/src/com/android/bluetooth/hid/HidService.java
index 893054a..219332e 100755
--- a/src/com/android/bluetooth/hid/HidService.java
+++ b/src/com/android/bluetooth/hid/HidService.java
@@ -185,13 +185,13 @@
} else {
broadcastConnectionState(device, convertHalState(halState));
}
- if (halState != CONN_STATE_CONNECTING) {
+ if (halState == CONN_STATE_CONNECTED &&
+ (mTargetDevice != null && mTargetDevice.equals(device))) {
mTargetDevice = null;
- }
- else {
- // CONN_STATE_CONNECTING is received only during
- // local initiated connection.
- mTargetDevice = device;
+ // local device originated connection to hid device, move out
+ // of quiet mode
+ AdapterService adapterService = AdapterService.getAdapterService();
+ adapterService.enable(false);
}
}
break;