Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-21 21:56:10 +00:00
committed by Gerrit Code Review
parent bdd0da8fa7 b06bb2186a
commit 045fdae1b3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -7991,7 +7991,7 @@ package android.bluetooth {
method public void onAppStatusChanged(android.bluetooth.BluetoothDevice, boolean);
method public void onConnectionStateChanged(android.bluetooth.BluetoothDevice, int);
method public void onGetReport(android.bluetooth.BluetoothDevice, byte, byte, int);
method public void onIntrData(android.bluetooth.BluetoothDevice, byte, byte[]);
method public void onInterruptData(android.bluetooth.BluetoothDevice, byte, byte[]);
method public void onSetProtocol(android.bluetooth.BluetoothDevice, byte);
method public void onSetReport(android.bluetooth.BluetoothDevice, byte, byte, byte[]);
method public void onVirtualCableUnplug(android.bluetooth.BluetoothDevice);

6
core/java/android/bluetooth/BluetoothHidDevice.java
View File

@@ -85,7 +85,7 @@ public final class BluetoothHidDevice implements BluetoothProfile {
*
* @see BluetoothHidDeviceCallback#onGetReport(BluetoothDevice, byte, byte, int)
* @see BluetoothHidDeviceCallback#onSetReport(BluetoothDevice, byte, byte, byte[])
* @see BluetoothHidDeviceCallback#onIntrData(BluetoothDevice, byte, byte[])
* @see BluetoothHidDeviceCallback#onInterruptData(BluetoothDevice, byte, byte[])
*/
public static final byte REPORT_TYPE_INPUT = (byte) 1;
public static final byte REPORT_TYPE_OUTPUT = (byte) 2;
@@ -155,8 +155,8 @@ public final class BluetoothHidDevice implements BluetoothProfile {
}
@Override
public void onIntrData(BluetoothDevice device, byte reportId, byte[] data) {
mCallback.onIntrData(device, reportId, data);
public void onInterruptData(BluetoothDevice device, byte reportId, byte[] data) {
mCallback.onInterruptData(device, reportId, data);
}
@Override

4
core/java/android/bluetooth/BluetoothHidDeviceCallback.java
View File

@@ -106,8 +106,8 @@ public abstract class BluetoothHidDeviceCallback {
* @param reportId Report Id.
* @param data Report data.
*/
public void onIntrData(BluetoothDevice device, byte reportId, byte[] data) {
Log.d(TAG, "onIntrData: device=" + device + " reportId=" + reportId);
public void onInterruptData(BluetoothDevice device, byte reportId, byte[] data) {
Log.d(TAG, "onInterruptData: device=" + device + " reportId=" + reportId);
}
/**