From: Matthew Xie <mattx@google.com>
Date: Fri, 24 Oct 2014 18:29:08 +0000 (-0700)
Subject: When local device originated connection to hid device, move out of quiet mode
X-Git-Tag: android-7.1.2_r17~424^2~40^2^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=739fb187;p=android-x86%2Fpackages-apps-Bluetooth.git

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 893054a8..219332e9 100755
--- a/src/com/android/bluetooth/hid/HidService.java
+++ b/src/com/android/bluetooth/hid/HidService.java
@@ -185,13 +185,13 @@ public class HidService extends ProfileService {
                     } 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;