commit b9d494049856e76c65ce3e0030e8ff8fb1066517
author Hansong Zhang <hsz@google.com> Fri Oct 20 17:49:41 2017 -0700
committer Hansong Zhang <hsz@google.com> Mon Oct 23 13:01:54 2017 -0700
tree f787b59882884f3fb569e85238f3c7a7d6bb4b8b
parent 51fb032a154fa756327c5dacce6a2540b1196c3b

Change Bluetooth HID Profile Name (4/6)

Make the Bluetooth HID profile name consistent with the Bluetooth HID
service name.

BluetoothInputHost → BluetoothHidDevice
BluetoothInputDevice → BluetoothHidHost
IBluetoothInputHost → IBluetoothHidDevice
IBluetoothInputDevice → IBluetoothHidHost
BluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE
BluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST

(Cherry-picked from commit c388d219380ce0730b3ffd4c0e5e436334fbdc04)
Merged-In: I1ed62e3abe89138bfbc7926e278fbebc5e49f488
Bug: 68055651
Test: make
Change-Id: I1ed62e3abe89138bfbc7926e278fbebc5e49f488

Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java

diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java b/Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java
index 6bd9212..6141f0a 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothInputDeviceConnector.java
@@ -18,7 +18,7 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothInputDevice;
+import android.bluetooth.BluetoothHidHost;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.hardware.input.InputManager;
@@ -55,7 +55,7 @@
             if (DEBUG) {
                 Log.d(TAG, "Connection made to bluetooth proxy.");
             }
-            mInputProxy = (BluetoothInputDevice) proxy;
+            mInputProxy = (BluetoothHidHost) proxy;
             if (mTarget != null) {
                 registerInputMethodMonitor();
                 if (DEBUG) {
@@ -73,7 +73,7 @@
         }
     };
 
-    private BluetoothInputDevice mInputProxy;
+    private BluetoothHidHost mInputProxy;
     private boolean mInputMethodMonitorRegistered = false;
 
     private BluetoothDevice mTarget;
@@ -133,7 +133,7 @@
         if (mInputProxy != null) {
             try {
                 BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-                adapter.closeProfileProxy(BluetoothProfile.INPUT_DEVICE, mInputProxy);
+                adapter.closeProfileProxy(BluetoothProfile.HID_HOST, mInputProxy);
                 mInputProxy = null;
             } catch (Throwable t) {
                 Log.w(TAG, "Error cleaning up input profile proxy", t);
@@ -154,7 +154,7 @@
 
     @Override
     public void openConnection(BluetoothAdapter adapter) {
-        if (!adapter.getProfileProxy(mContext, mServiceConnection, BluetoothProfile.INPUT_DEVICE)) {
+        if (!adapter.getProfileProxy(mContext, mServiceConnection, BluetoothProfile.HID_HOST)) {
             mOpenConnectionCallback.failed();
         }
     }