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

Commit 0993afe1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix included service parsing (2/3)"

parents da8a9936 006bd3c9

android/app/src/com/android/bluetooth/gatt/GattService.java

+13 −6
Original line number Original line Diff line number Diff line
@@ -1047,33 +1047,40 @@ public class GattService extends ProfileService { 
            {

            {

                case GattDbElement.TYPE_PRIMARY_SERVICE:

                case GattDbElement.TYPE_PRIMARY_SERVICE:

                case GattDbElement.TYPE_SECONDARY_SERVICE:

                case GattDbElement.TYPE_SECONDARY_SERVICE:

                    if (DBG) Log.d(TAG, "got service with UUID=" + el.uuid);

                    if (DBG) Log.d(TAG, "got service with UUID=" + el.uuid + " id: " + el.id);





                    currSrvc = new BluetoothGattService(el.uuid, el.id, el.type);

                    currSrvc = new BluetoothGattService(el.uuid, el.id, el.type);

                    db_out.add(currSrvc);

                    db_out.add(currSrvc);

                    break;

                    break;





                case GattDbElement.TYPE_CHARACTERISTIC:

                case GattDbElement.TYPE_CHARACTERISTIC:

                    if (DBG) Log.d(TAG, "got characteristic with UUID=" + el.uuid);

                    if (DBG)

                        Log.d(TAG, "got characteristic with UUID=" + el.uuid + " id: " + el.id);





                    currChar = new BluetoothGattCharacteristic(el.uuid, el.id, el.properties, 0);

                    currChar = new BluetoothGattCharacteristic(el.uuid, el.id, el.properties, 0);

                    currSrvc.addCharacteristic(currChar);

                    currSrvc.addCharacteristic(currChar);

                    break;

                    break;





                case GattDbElement.TYPE_DESCRIPTOR:

                case GattDbElement.TYPE_DESCRIPTOR:

                    if (DBG) Log.d(TAG, "got descriptor with UUID=" + el.uuid);

                    if (DBG) Log.d(TAG, "got descriptor with UUID=" + el.uuid + " id: " + el.id);





                    currChar.addDescriptor(new BluetoothGattDescriptor(el.uuid, el.id, 0));

                    currChar.addDescriptor(new BluetoothGattDescriptor(el.uuid, el.id, 0));

                    break;

                    break;





                case GattDbElement.TYPE_INCLUDED_SERVICE:

                case GattDbElement.TYPE_INCLUDED_SERVICE:

                    if (DBG) Log.d(TAG, "got included service with UUID=" + el.uuid);

                    if (DBG)

                        Log.d(TAG,

                                "got included service with UUID=" + el.uuid + " id: " + el.id

                                        + " startHandle: " + el.startHandle);





                    currSrvc.addIncludedService(new BluetoothGattService(el.uuid, el.id, el.type));

                    currSrvc.addIncludedService(

                            new BluetoothGattService(el.uuid, el.startHandle, el.type));

                    break;

                    break;





                default:

                default:

                    Log.e(TAG, "got unknown element with type=" + el.type + " and UUID=" + el.uuid);

                    Log.e(TAG,

                            "got unknown element with type=" + el.type + " and UUID=" + el.uuid

                                    + " id: " + el.id);

            }

            }

        }

        }