From b06bb2186aae106acb5b7660600b1207423cd196 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Mon, 18 Dec 2017 15:18:39 -0800 Subject: BluetoothHidDevice: rename onIntrData to onInterruptData (1/5) Bug: 63384609 Test: make Merged-In: I3b55f7383d2a84162d681ebf3740ddc9e8a55bbb Change-Id: I3b55f7383d2a84162d681ebf3740ddc9e8a55bbb (cherry picked from commit 42324278bfb55beefb3abcb6aae20ac70d87e2c5) --- api/current.txt | 2 +- core/java/android/bluetooth/BluetoothHidDevice.java | 6 +++--- core/java/android/bluetooth/BluetoothHidDeviceCallback.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/current.txt b/api/current.txt index ba107f4b54f2..ac730231d4be 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/core/java/android/bluetooth/BluetoothHidDevice.java b/core/java/android/bluetooth/BluetoothHidDevice.java index f38e462eab4f..2fab305ba8bd 100644 --- a/core/java/android/bluetooth/BluetoothHidDevice.java +++ b/core/java/android/bluetooth/BluetoothHidDevice.java @@ -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 diff --git a/core/java/android/bluetooth/BluetoothHidDeviceCallback.java b/core/java/android/bluetooth/BluetoothHidDeviceCallback.java index bd19955b4e62..e71b00f2349f 100644 --- a/core/java/android/bluetooth/BluetoothHidDeviceCallback.java +++ b/core/java/android/bluetooth/BluetoothHidDeviceCallback.java @@ -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); } /** -- cgit v1.2.3-59-g8ed1b