Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 045fdae1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents bdd0da8f b06bb218

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/bluetooth/BluetoothHidDevice.java

+3 −3
Original line number Diff line number Diff line
@@ -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

core/java/android/bluetooth/BluetoothHidDeviceCallback.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**