1 files changed, 5 insertions, 0 deletions
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java b/Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java
index 20271359c..c3903717c 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java
@@ -56,6 +56,11 @@ public class BluetoothInputDeviceConnector implements BluetoothDevicePairer.Blue
             }
             mInputProxy = (BluetoothHidHost) proxy;
             if (mTarget != null) {
+                if (BluetoothProfile.STATE_CONNECTED == mInputProxy.getConnectionState(mTarget)) {
+                    closeInputProfileProxy();
+                    mOpenConnectionCallback.succeeded();
+                    return;
+                }
                 registerInputMethodMonitor();
                 if (DEBUG) {
                     Log.d(TAG, "Connecting to target: " + mTarget.getAddress());