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

Commit 4220331d authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Fix logging for HID host and device service 

* Use constant String for log tag
* Added warning messages for registerApp() and unregisterApp() failures
in HidDevService
* Added some loggings for HidService
* Changed some logging levels for HidDevService

Test: build
Change-Id: I19fd40387cfce5d371f49e45e775cf151ba79195
parent f87379d6

android/app/src/com/android/bluetooth/hid/HidDevService.java

+36 −30
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import java.util.NoSuchElementException; 
public class HidDevService extends ProfileService {

    private static final boolean DBG = false;



    private static final String TAG = HidDevService.class.getSimpleName();

    private static final String TAG = "BluetoothHidDevService";



    private static final int MESSAGE_APPLICATION_STATE_CHANGED = 1;

    private static final int MESSAGE_CONNECT_STATE_CHANGED = 2;
@@ -75,7 +75,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public void handleMessage(Message msg) {

            if (DBG) {

                Log.v(TAG, "handleMessage(): msg.what=" + msg.what);

                Log.d(TAG, "handleMessage(): msg.what=" + msg.what);

            }



            switch (msg.what) {
@@ -280,7 +280,7 @@ public class HidDevService extends ProfileService { 
                BluetoothHidDeviceAppSdpSettings sdp, BluetoothHidDeviceAppQosSettings inQos,

                BluetoothHidDeviceAppQosSettings outQos, IBluetoothHidDeviceCallback callback) {

            if (DBG) {

                Log.v(TAG, "registerApp()");

                Log.d(TAG, "registerApp()");

            }



            HidDevService service = getService();
@@ -294,7 +294,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public boolean unregisterApp(BluetoothHidDeviceAppConfiguration config) {

            if (DBG) {

                Log.v(TAG, "unregisterApp()");

                Log.d(TAG, "unregisterApp()");

            }



            HidDevService service = getService();
@@ -308,7 +308,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public boolean sendReport(BluetoothDevice device, int id, byte[] data) {

            if (DBG) {

                Log.v(TAG, "sendReport(): device=" + device + "  id=" + id);

                Log.d(TAG, "sendReport(): device=" + device + "  id=" + id);

            }



            HidDevService service = getService();
@@ -322,7 +322,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public boolean replyReport(BluetoothDevice device, byte type, byte id, byte[] data) {

            if (DBG) {

                Log.v(TAG, "replyReport(): device=" + device + " type=" + type + " id=" + id);

                Log.d(TAG, "replyReport(): device=" + device + " type=" + type + " id=" + id);

            }



            HidDevService service = getService();
@@ -336,7 +336,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public boolean unplug(BluetoothDevice device) {

            if (DBG) {

                Log.v(TAG, "unplug(): device=" + device);

                Log.d(TAG, "unplug(): device=" + device);

            }



            HidDevService service = getService();
@@ -350,7 +350,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public boolean connect(BluetoothDevice device) {

            if (DBG) {

                Log.v(TAG, "connect(): device=" + device);

                Log.d(TAG, "connect(): device=" + device);

            }



            HidDevService service = getService();
@@ -364,7 +364,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public boolean disconnect(BluetoothDevice device) {

            if (DBG) {

                Log.v(TAG, "disconnect(): device=" + device);

                Log.d(TAG, "disconnect(): device=" + device);

            }



            HidDevService service = getService();
@@ -378,7 +378,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public boolean reportError(BluetoothDevice device, byte error) {

            if (DBG) {

                Log.v(TAG, "reportError(): device=" + device + " error=" + error);

                Log.d(TAG, "reportError(): device=" + device + " error=" + error);

            }



            HidDevService service = getService();
@@ -392,7 +392,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public int getConnectionState(BluetoothDevice device) {

            if (DBG) {

                Log.v(TAG, "getConnectionState(): device=" + device);

                Log.d(TAG, "getConnectionState(): device=" + device);

            }



            HidDevService service = getService();
@@ -406,7 +406,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public List<BluetoothDevice> getConnectedDevices() {

            if (DBG) {

                Log.v(TAG, "getConnectedDevices()");

                Log.d(TAG, "getConnectedDevices()");

            }



            return getDevicesMatchingConnectionStates(new int[]{BluetoothProfile.STATE_CONNECTED});
@@ -415,7 +415,7 @@ public class HidDevService extends ProfileService { 
        @Override

        public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {

            if (DBG) {

                Log.v(TAG,

                Log.d(TAG,

                        "getDevicesMatchingConnectionStates(): states=" + Arrays.toString(states));

            }
@@ -445,10 +445,11 @@ public class HidDevService extends ProfileService { 
            BluetoothHidDeviceAppSdpSettings sdp, BluetoothHidDeviceAppQosSettings inQos,

            BluetoothHidDeviceAppQosSettings outQos, IBluetoothHidDeviceCallback callback) {

        if (DBG) {

            Log.v(TAG, "registerApp()");

            Log.d(TAG, "registerApp()");

        }



        if (mAppConfig != null) {

            Log.w(TAG, "registerApp: failed because app configuration already exists. ");

            return false;

        }
@@ -462,10 +463,15 @@ public class HidDevService extends ProfileService { 


    synchronized boolean unregisterApp(BluetoothHidDeviceAppConfiguration config) {

        if (DBG) {

            Log.v(TAG, "unregisterApp()");

            Log.d(TAG, "unregisterApp()");

        }

        if (config == null) {

            Log.w(TAG, "unregisterApp: failed. The config in parameter should not be null");

            return false;

        }



        if (mAppConfig == null || config == null || !config.equals(mAppConfig)) {

        if (mAppConfig == null ||  !config.equals(mAppConfig)) {

            Log.w(TAG, "unregisterApp: failed. The app configuration does not match the record");

            return false;

        }
@@ -474,7 +480,7 @@ public class HidDevService extends ProfileService { 


    synchronized boolean sendReport(BluetoothDevice device, int id, byte[] data) {

        if (DBG) {

            Log.v(TAG, "sendReport(): device=" + device + " id=" + id);

            Log.d(TAG, "sendReport(): device=" + device + " id=" + id);

        }



        if (!checkDevice(device)) {
@@ -486,7 +492,7 @@ public class HidDevService extends ProfileService { 


    synchronized boolean replyReport(BluetoothDevice device, byte type, byte id, byte[] data) {

        if (DBG) {

            Log.v(TAG, "replyReport(): device=" + device + " type=" + type + " id=" + id);

            Log.d(TAG, "replyReport(): device=" + device + " type=" + type + " id=" + id);

        }



        if (!checkDevice(device)) {
@@ -498,7 +504,7 @@ public class HidDevService extends ProfileService { 


    synchronized boolean unplug(BluetoothDevice device) {

        if (DBG) {

            Log.v(TAG, "unplug(): device=" + device);

            Log.d(TAG, "unplug(): device=" + device);

        }



        if (!checkDevice(device)) {
@@ -510,7 +516,7 @@ public class HidDevService extends ProfileService { 


    synchronized boolean connect(BluetoothDevice device) {

        if (DBG) {

            Log.v(TAG, "connect(): device=" + device);

            Log.d(TAG, "connect(): device=" + device);

        }



        return connectNative(Utils.getByteAddress(device));
@@ -518,7 +524,7 @@ public class HidDevService extends ProfileService { 


    synchronized boolean disconnect(BluetoothDevice device) {

        if (DBG) {

            Log.v(TAG, "disconnect(): device=" + device);

            Log.d(TAG, "disconnect(): device=" + device);

        }



        if (!checkDevice(device)) {
@@ -530,7 +536,7 @@ public class HidDevService extends ProfileService { 


    synchronized boolean reportError(BluetoothDevice device, byte error) {

        if (DBG) {

            Log.v(TAG, "reportError(): device=" + device + " error=" + error);

            Log.d(TAG, "reportError(): device=" + device + " error=" + error);

        }



        if (!checkDevice(device)) {
@@ -599,7 +605,7 @@ public class HidDevService extends ProfileService { 


    private synchronized void onApplicationStateChanged(byte[] address, boolean registered) {

        if (DBG) {

            Log.v(TAG, "onApplicationStateChanged(): registered=" + registered);

            Log.d(TAG, "onApplicationStateChanged(): registered=" + registered);

        }



        Message msg = mHandler.obtainMessage(MESSAGE_APPLICATION_STATE_CHANGED);
@@ -610,7 +616,7 @@ public class HidDevService extends ProfileService { 


    private synchronized void onConnectStateChanged(byte[] address, int state) {

        if (DBG) {

            Log.v(TAG, "onConnectStateChanged(): address=" + Arrays.toString(address) + " state="

            Log.d(TAG, "onConnectStateChanged(): address=" + Arrays.toString(address) + " state="

                    + state);

        }
@@ -622,7 +628,7 @@ public class HidDevService extends ProfileService { 


    private synchronized void onGetReport(byte type, byte id, short bufferSize) {

        if (DBG) {

            Log.v(TAG, "onGetReport(): type=" + type + " id=" + id + " bufferSize=" + bufferSize);

            Log.d(TAG, "onGetReport(): type=" + type + " id=" + id + " bufferSize=" + bufferSize);

        }



        Message msg = mHandler.obtainMessage(MESSAGE_GET_REPORT);
@@ -634,7 +640,7 @@ public class HidDevService extends ProfileService { 


    private synchronized void onSetReport(byte reportType, byte reportId, byte[] data) {

        if (DBG) {

            Log.v(TAG, "onSetReport(): reportType=" + reportType + " reportId=" + reportId);

            Log.d(TAG, "onSetReport(): reportType=" + reportType + " reportId=" + reportId);

        }



        ByteBuffer bb = ByteBuffer.wrap(data);
@@ -648,7 +654,7 @@ public class HidDevService extends ProfileService { 


    private synchronized void onSetProtocol(byte protocol) {

        if (DBG) {

            Log.v(TAG, "onSetProtocol(): protocol=" + protocol);

            Log.d(TAG, "onSetProtocol(): protocol=" + protocol);

        }



        Message msg = mHandler.obtainMessage(MESSAGE_SET_PROTOCOL);
@@ -658,7 +664,7 @@ public class HidDevService extends ProfileService { 


    private synchronized void onIntrData(byte reportId, byte[] data) {

        if (DBG) {

            Log.v(TAG, "onIntrData(): reportId=" + reportId);

            Log.d(TAG, "onIntrData(): reportId=" + reportId);

        }



        ByteBuffer bb = ByteBuffer.wrap(data);
@@ -671,7 +677,7 @@ public class HidDevService extends ProfileService { 


    private synchronized void onVirtualCableUnplug() {

        if (DBG) {

            Log.v(TAG, "onVirtualCableUnplug()");

            Log.d(TAG, "onVirtualCableUnplug()");

        }



        Message msg = mHandler.obtainMessage(MESSAGE_VC_UNPLUG);
@@ -680,7 +686,7 @@ public class HidDevService extends ProfileService { 


    private void broadcastConnectionState(BluetoothDevice device, int newState) {

        if (DBG) {

            Log.v(TAG, "broadcastConnectionState(): device=" + device.getAddress() + " newState="

            Log.d(TAG, "broadcastConnectionState(): device=" + device.getAddress() + " newState="

                    + newState);

        }

android/app/src/com/android/bluetooth/hid/HidService.java

+43 −3
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ import java.util.Map; 
 * @hide

 */

public class HidService extends ProfileService {

    private static final boolean DBG = true;

    private static final String TAG = "HidService";

    private static final boolean DBG = false;

    private static final String TAG = "BluetoothHidService";



    private Map<BluetoothDevice, Integer> mInputDevices;

    private boolean mNativeAvailable;
@@ -94,13 +94,14 @@ public class HidService extends ProfileService { 
    @Override

    protected boolean stop() {

        if (DBG) {

            log("Stopping Bluetooth HidService");

            Log.d(TAG, "Stopping Bluetooth HidService");

        }

        return true;

    }



    @Override

    protected boolean cleanup() {

        if (DBG) Log.d(TAG, "Stopping Bluetooth HidService");

        if (mNativeAvailable) {

            cleanupNative();

            mNativeAvailable = false;
@@ -162,6 +163,8 @@ public class HidService extends ProfileService { 


        @Override

        public void handleMessage(Message msg) {

            if (DBG) Log.v(TAG, "handleMessage(): msg.what=" + msg.what);



            switch (msg.what) {

                case MESSAGE_CONNECT: {

                    BluetoothDevice device = (BluetoothDevice) msg.obj;
@@ -346,6 +349,7 @@ public class HidService extends ProfileService { 
            if (mService != null && mService.isAvailable()) {

                return mService;

            }

            Log.w(TAG, "Service is null");

            return null;

        }
@@ -487,6 +491,7 @@ public class HidService extends ProfileService { 


    //APIs

    boolean connect(BluetoothDevice device) {

        if (DBG) Log.d(TAG, "connect: " + device.getAddress());

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        if (getConnectionState(device) != BluetoothInputDevice.STATE_DISCONNECTED) {

            Log.e(TAG, "Hid Device not disconnected: " + device);
@@ -503,6 +508,7 @@ public class HidService extends ProfileService { 
    }



    boolean disconnect(BluetoothDevice device) {

        if (DBG) Log.d(TAG, "disconnect: " + device.getAddress());

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        Message msg = mHandler.obtainMessage(MESSAGE_DISCONNECT, device);

        mHandler.sendMessage(msg);
@@ -510,6 +516,7 @@ public class HidService extends ProfileService { 
    }



    int getConnectionState(BluetoothDevice device) {

        if (DBG) Log.d(TAG, "getConnectionState: " + device.getAddress());

        if (mInputDevices.get(device) == null) {

            return BluetoothInputDevice.STATE_DISCONNECTED;

        }
@@ -517,6 +524,7 @@ public class HidService extends ProfileService { 
    }



    List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {

        if (DBG) Log.d(TAG, "getDevicesMatchingConnectionStates()");

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        List<BluetoothDevice> inputDevices = new ArrayList<BluetoothDevice>();
@@ -534,6 +542,9 @@ public class HidService extends ProfileService { 


    public boolean setPriority(BluetoothDevice device, int priority) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) {

            Log.d(TAG, "setPriority: " + device.getAddress());

        }

        Settings.Global.putInt(getContentResolver(),

                Settings.Global.getBluetoothInputDevicePriorityKey(device.getAddress()), priority);

        if (DBG) {
@@ -544,6 +555,9 @@ public class HidService extends ProfileService { 


    public int getPriority(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) {

            Log.d(TAG, "getPriority: " + device.getAddress());

        }

        int priority = Settings.Global.getInt(getContentResolver(),

                Settings.Global.getBluetoothInputDevicePriorityKey(device.getAddress()),

                BluetoothProfile.PRIORITY_UNDEFINED);
@@ -553,6 +567,9 @@ public class HidService extends ProfileService { 
    /* The following APIs regarding test app for compliance */

    boolean getProtocolMode(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) {

            Log.d(TAG, "getProtocolMode: " + device.getAddress());

        }

        int state = this.getConnectionState(device);

        if (state != BluetoothInputDevice.STATE_CONNECTED) {

            return false;
@@ -566,6 +583,9 @@ public class HidService extends ProfileService { 


    boolean virtualUnplug(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) {

            Log.d(TAG, "virtualUnplug: " + device.getAddress());

        }

        int state = this.getConnectionState(device);

        if (state != BluetoothInputDevice.STATE_CONNECTED) {

            return false;
@@ -577,6 +597,9 @@ public class HidService extends ProfileService { 


    boolean setProtocolMode(BluetoothDevice device, int protocolMode) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) {

            Log.d(TAG, "setProtocolMode: " + device.getAddress());

        }

        int state = this.getConnectionState(device);

        if (state != BluetoothInputDevice.STATE_CONNECTED) {

            return false;
@@ -590,6 +613,9 @@ public class HidService extends ProfileService { 


    boolean getReport(BluetoothDevice device, byte reportType, byte reportId, int bufferSize) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) {

            Log.d(TAG, "getReport: " + device.getAddress());

        }

        int state = this.getConnectionState(device);

        if (state != BluetoothInputDevice.STATE_CONNECTED) {

            return false;
@@ -607,6 +633,9 @@ public class HidService extends ProfileService { 


    boolean setReport(BluetoothDevice device, byte reportType, String report) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) {

            Log.d(TAG, "setReport: " + device.getAddress());

        }

        int state = this.getConnectionState(device);

        if (state != BluetoothInputDevice.STATE_CONNECTED) {

            return false;
@@ -624,6 +653,9 @@ public class HidService extends ProfileService { 


    boolean sendData(BluetoothDevice device, String report) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) {

            Log.d(TAG, "sendData: " + device.getAddress());

        }

        int state = this.getConnectionState(device);

        if (state != BluetoothInputDevice.STATE_CONNECTED) {

            return false;
@@ -634,6 +666,7 @@ public class HidService extends ProfileService { 


    boolean getIdleTime(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) Log.d(TAG, "getIdleTime: " + device.getAddress());

        int state = this.getConnectionState(device);

        if (state != BluetoothInputDevice.STATE_CONNECTED) {

            return false;
@@ -645,6 +678,7 @@ public class HidService extends ProfileService { 


    boolean setIdleTime(BluetoothDevice device, byte idleTime) {

        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) Log.d(TAG, "setIdleTime: " + device.getAddress());

        int state = this.getConnectionState(device);

        if (state != BluetoothInputDevice.STATE_CONNECTED) {

            return false;
@@ -659,6 +693,7 @@ public class HidService extends ProfileService { 
    }



    private void onGetProtocolMode(byte[] address, int mode) {

        if (DBG) Log.d(TAG, "onGetProtocolMode()");

        Message msg = mHandler.obtainMessage(MESSAGE_ON_GET_PROTOCOL_MODE);

        msg.obj = address;

        msg.arg1 = mode;
@@ -666,6 +701,7 @@ public class HidService extends ProfileService { 
    }



    private void onGetIdleTime(byte[] address, int idleTime) {

        if (DBG) Log.d(TAG, "onGetIdleTime()");

        Message msg = mHandler.obtainMessage(MESSAGE_ON_GET_IDLE_TIME);

        msg.obj = address;

        msg.arg1 = idleTime;
@@ -673,6 +709,7 @@ public class HidService extends ProfileService { 
    }



    private void onGetReport(byte[] address, byte[] report, int rptSize) {

        if (DBG) Log.d(TAG, "onGetReport()");

        Message msg = mHandler.obtainMessage(MESSAGE_ON_GET_REPORT);

        msg.obj = address;

        Bundle data = new Bundle();
@@ -683,6 +720,7 @@ public class HidService extends ProfileService { 
    }



    private void onHandshake(byte[] address, int status) {

        if (DBG) Log.d(TAG, "onHandshake: status=" + status);

        Message msg = mHandler.obtainMessage(MESSAGE_ON_HANDSHAKE);

        msg.obj = address;

        msg.arg1 = status;
@@ -690,6 +728,7 @@ public class HidService extends ProfileService { 
    }



    private void onVirtualUnplug(byte[] address, int status) {

        if (DBG) Log.d(TAG, "onVirtualUnplug: status=" + status);

        Message msg = mHandler.obtainMessage(MESSAGE_ON_VIRTUAL_UNPLUG);

        msg.obj = address;

        msg.arg1 = status;
@@ -697,6 +736,7 @@ public class HidService extends ProfileService { 
    }



    private void onConnectStateChanged(byte[] address, int state) {

        if (DBG) Log.d(TAG, "onConnectStateChanged: state=" + state);

        Message msg = mHandler.obtainMessage(MESSAGE_CONNECT_STATE_CHANGED);

        msg.obj = address;

        msg.arg1 = state;