| Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
|
| diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
|
| index d6a3eb0644995778f1e05821469b10971ab4635c..fadb5be32c2d1fd2df902a224b61c9e99eb1a95b 100644
|
| --- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
|
| +++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
|
| @@ -312,12 +312,9 @@ final class ChromeBluetoothAdapter extends BroadcastReceiver {
|
| private native void nativeOnScanFailed(long nativeBluetoothAdapterAndroid);
|
|
|
| // Binds to BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan.
|
| - // 'Object' type must be used for |bluetoothDeviceWrapper| because inner class
|
| - // Wrappers.BluetoothDeviceWrapper reference is not handled by jni_generator.py JavaToJni.
|
| - // http://crbug.com/505554
|
| private native void nativeCreateOrUpdateDeviceOnScan(long nativeBluetoothAdapterAndroid,
|
| - String address, Object bluetoothDeviceWrapper, int rssi, String[] advertisedUuids,
|
| - int txPower);
|
| + String address, BluetoothDeviceWrapper bluetoothDeviceWrapper, int rssi,
|
| + String[] advertisedUuids, int txPower);
|
|
|
| // Binds to BluetoothAdapterAndroid::nativeOnAdapterStateChanged
|
| private native void nativeOnAdapterStateChanged(
|
|
|