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

Commit 6fe7873a authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "BAS: Write CCCD to get notified battery level" am: faa264e0 am: 83ce8468 am: f6654bc6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2122372



Change-Id: I5e7dff6d8b039b8613e1e8be275083773030001e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec907c62 f6654bc6

android/app/src/com/android/bluetooth/bas/BatteryStateMachine.java

+22 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.bluetooth.BluetoothDevice; 
import android.bluetooth.BluetoothGatt;

import android.bluetooth.BluetoothGattCallback;

import android.bluetooth.BluetoothGattCharacteristic;

import android.bluetooth.BluetoothGattDescriptor;

import android.bluetooth.BluetoothGattService;

import android.bluetooth.BluetoothProfile;

import android.os.Looper;
@@ -51,9 +52,10 @@ public class BatteryStateMachine extends StateMachine { 


    static final UUID GATT_BATTERY_SERVICE_UUID =

            UUID.fromString("0000180f-0000-1000-8000-00805f9b34fb");



    static final UUID GATT_BATTERY_LEVEL_CHARACTERISTIC_UUID =

            UUID.fromString("00002a19-0000-1000-8000-00805f9b34fb");

    static final UUID CLIENT_CHARACTERISTIC_CONFIG_DESCRIPTOR_UUID =

            UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");



    static final int CONNECT = 1;

    static final int DISCONNECT = 2;
@@ -553,7 +555,8 @@ public class BatteryStateMachine extends StateMachine { 
                return;

            }



            gatt.setCharacteristicNotification(batteryLevel, /*enable=*/true);

            // This may not trigger onCharacteristicRead if CCCD is already set but then

            // onCharacteristicChanged will be triggered soon.

            gatt.readCharacteristic(batteryLevel);

        }
@@ -575,6 +578,23 @@ public class BatteryStateMachine extends StateMachine { 


            if (GATT_BATTERY_LEVEL_CHARACTERISTIC_UUID.equals(characteristic.getUuid())) {

                updateBatteryLevel(value);

                BluetoothGattDescriptor cccd =

                        characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG_DESCRIPTOR_UUID);

                if (cccd != null) {

                    gatt.setCharacteristicNotification(characteristic, /*enable=*/true);

                    gatt.writeDescriptor(cccd, BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);

                } else {

                    Log.w(TAG, "No CCCD for battery level characteristic, "

                            + "it won't be notified");

                }

            }

        }



        @Override

        public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor,

                int status) {

            if (status != BluetoothGatt.GATT_SUCCESS) {

                Log.w(TAG, "Failed to write descriptor " + descriptor.getUuid());

            }

        }