commit 1392d6101ae50bbb6ea891e8c43e29a07fa69493
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 22 21:50:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 22 21:50:57 2018 +0000
tree ddceb0550f3a294c949cdfff969ef2751a24f03c
parent 89aaef0993003ef19cdb1bbab4c37c9513e81653
parent 8b85bbf4ff85b8cdd6751076f201eaf10a470501

Merge "HIDD: Address API Review concerns"

Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidDeviceFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidDeviceFacade.java b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidDeviceFacade.java
index dbe509e..66ab908 100644
--- a/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidDeviceFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/bluetooth/BluetoothHidDeviceFacade.java
@@ -22,7 +22,6 @@
 import android.bluetooth.BluetoothHidDevice;
 import android.bluetooth.BluetoothHidDeviceAppQosSettings;
 import android.bluetooth.BluetoothHidDeviceAppSdpSettings;
-import android.bluetooth.BluetoothHidDeviceCallback;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.BluetoothUuid;
 import android.os.Bundle;
@@ -161,7 +160,7 @@
     private static boolean sIsHidDeviceReady = false;
     private static BluetoothHidDevice sHidDeviceProfile = null;
 
-    private BluetoothHidDeviceCallback mCallback = new BluetoothHidDeviceCallback() {
+    private BluetoothHidDevice.Callback mCallback = new BluetoothHidDevice.Callback() {
         @Override
         public void onAppStatusChanged(BluetoothDevice pluggedDevice, boolean registered) {
             Log.d("onAppStatusChanged: pluggedDevice=" + pluggedDevice + " registered="
@@ -171,6 +170,7 @@
             mEventFacade.postEvent("onAppStatusChanged", result);
         }
 
+        @Override
         public void onConnectionStateChanged(BluetoothDevice device, int state) {
             Log.d("onConnectionStateChanged: device=" + device + " state=" + state);
             Bundle result = new Bundle();
@@ -178,6 +178,7 @@
             mEventFacade.postEvent("onConnectionStateChanged", result);
         }
 
+        @Override
         public void onGetReport(BluetoothDevice device, byte type, byte id, int bufferSize) {
             Log.d("onGetReport: device=" + device + " type=" + type + " id=" + id + " bufferSize="
                     + bufferSize);
@@ -188,6 +189,7 @@
             mEventFacade.postEvent("onGetReport", result);
         }
 
+        @Override
         public void onSetReport(BluetoothDevice device, byte type, byte id, byte[] data) {
             Log.d("onSetReport: device=" + device + " type=" + type + " id=" + id);
             Bundle result = new Bundle();
@@ -197,6 +199,7 @@
             mEventFacade.postEvent("onSetReport", result);
         }
 
+        @Override
         public void onSetProtocol(BluetoothDevice device, byte protocol) {
             Log.d("onSetProtocol: device=" + device + " protocol=" + protocol);
             Bundle result = new Bundle();
@@ -204,6 +207,7 @@
             mEventFacade.postEvent("onSetProtocol", result);
         }
 
+        @Override
         public void onInterruptData(BluetoothDevice device, byte reportId, byte[] data) {
             Log.d("onInterruptData: device=" + device + " reportId=" + reportId);
             Bundle result = new Bundle();
@@ -212,6 +216,7 @@
             mEventFacade.postEvent("onInterruptData", result);
         }
 
+        @Override
         public void onVirtualCableUnplug(BluetoothDevice device) {
             Log.d("onVirtualCableUnplug: device=" + device);
             Bundle result = new Bundle();
@@ -364,7 +369,8 @@
     @Rpc(description = "Register app for the HID Device service using default settings.")
     public Boolean bluetoothHidDeviceRegisterApp() throws Exception {
         return sHidDeviceProfile != null
-                && sHidDeviceProfile.registerApp(sSdpSettings, null, sQos, mCallback);
+                && sHidDeviceProfile.registerApp(
+                        sSdpSettings, null, sQos, command -> command.run(), mCallback);
     }
 
     /**