commit 32e82fb6333c012f8d332688cb7a105e7281e3a8
author Hansong Zhang <hsz@google.com> Mon Oct 23 22:30:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 23 22:30:48 2017 +0000
tree ac86447243063ffbb6674c6fbdfa5f5bd260eea1
parent 19306cb4eab507e157650cdbda78607b81f82e92
parent 42c5395d6f6fd58c7472a5c00705d9fa11579045

Merge "Change Bluetooth HID Profile Name (5/6)"
am: 42c5395d6f

Change-Id: I37879c26d7ed1670e48a00ecbc9b07c9c9af8edf

src/com/android/nfc/handover/BluetoothPeripheralHandover.java

diff --git a/src/com/android/nfc/handover/BluetoothPeripheralHandover.java b/src/com/android/nfc/handover/BluetoothPeripheralHandover.java
index 84618ed..f50fe56 100644
--- a/src/com/android/nfc/handover/BluetoothPeripheralHandover.java
+++ b/src/com/android/nfc/handover/BluetoothPeripheralHandover.java
@@ -21,7 +21,7 @@
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
-import android.bluetooth.BluetoothInputDevice;
+import android.bluetooth.BluetoothHidHost;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
 import android.bluetooth.OobData;
@@ -111,7 +111,7 @@
     // protected by mLock
     BluetoothA2dp mA2dp;
     BluetoothHeadset mHeadset;
-    BluetoothInputDevice mInput;
+    BluetoothHidHost mInput;
 
     public interface Callback {
         public void onBluetoothPeripheralHandoverComplete(boolean connected);
@@ -167,7 +167,7 @@
         filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
         filter.addAction(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
         filter.addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);
-        filter.addAction(BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED);
+        filter.addAction(BluetoothHidHost.ACTION_CONNECTION_STATE_CHANGED);
         filter.addAction(ACTION_ALLOW_CONNECT);
         filter.addAction(ACTION_DENY_CONNECT);
 
@@ -318,7 +318,7 @@
     boolean getProfileProxys() {
 
         if (mTransport == BluetoothDevice.TRANSPORT_LE) {
-            if (!mBluetoothAdapter.getProfileProxy(mContext, this, BluetoothProfile.INPUT_DEVICE))
+            if (!mBluetoothAdapter.getProfileProxy(mContext, this, BluetoothProfile.HID_HOST))
                 return false;
         } else {
             if(!mBluetoothAdapter.getProfileProxy(mContext, this, BluetoothProfile.HEADSET))
@@ -487,7 +487,7 @@
                     nextStep();
                 }
             }
-        } else if (BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED.equals(action) &&
+        } else if (BluetoothHidHost.ACTION_CONNECTION_STATE_CHANGED.equals(action) &&
                 (mState == STATE_CONNECTING || mState == STATE_DISCONNECTING)) {
             int state = intent.getIntExtra(BluetoothProfile.EXTRA_STATE, BluetoothAdapter.ERROR);
             if (state == BluetoothProfile.STATE_CONNECTED) {
@@ -515,7 +515,7 @@
             }
 
             if (mInput != null) {
-                mBluetoothAdapter.closeProfileProxy(BluetoothProfile.INPUT_DEVICE, mInput);
+                mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HID_HOST, mInput);
             }
 
             mA2dp = null;
@@ -634,8 +634,8 @@
                         mHandler.sendEmptyMessage(MSG_NEXT_STEP);
                     }
                     break;
-                case BluetoothProfile.INPUT_DEVICE:
-                    mInput = (BluetoothInputDevice) proxy;
+                case BluetoothProfile.HID_HOST:
+                    mInput = (BluetoothHidHost) proxy;
                     if (mInput != null) {
                         mHandler.sendEmptyMessage(MSG_NEXT_STEP);
                     }