commit fe19c7f20ca3abc252965be60727e8a198cc6ff3
author Matthew Xie <mattx@google.com> Fri Oct 24 11:29:08 2014 -0700
committer The Android Automerger <android-build@google.com> Fri Oct 24 16:05:29 2014 -0700
tree 03d5ffb7ddbbda6a126f310795a65ce9c3e69a1e
parent c8d240d13c50539e4c857df76d2422e90ac86f17

When local device originated connection to hid device, move out of quiet mode

bug 17480992

Change-Id: Ia3f5ef4886dfde370abe5b35a80ab80a4f030f37

src/com/android/bluetooth/hid/HidService.java

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;