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

Commit dbf26ff1 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Create metadata after the device is bonded" into main am: 6fbc74ed 

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



Change-Id: I09e9f819198c762a5626e34ac8f1f033df1e7da5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e9f86f7 6fbc74ed

android/app/src/com/android/bluetooth/btservice/storage/DatabaseManager.java

+18 −2
Original line number Original line Diff line number Diff line
@@ -201,6 +201,7 @@ public class DatabaseManager { 
    void bondStateChanged(BluetoothDevice device, int state) {

    void bondStateChanged(BluetoothDevice device, int state) {

        synchronized (mMetadataCache) {

        synchronized (mMetadataCache) {

            String address = device.getAddress();

            String address = device.getAddress();

            if (!Flags.createMetadataAfterBonding()) {

                if (state != BluetoothDevice.BOND_NONE) {

                if (state != BluetoothDevice.BOND_NONE) {

                    if (mMetadataCache.containsKey(address)) {

                    if (mMetadataCache.containsKey(address)) {

                        return;

                        return;
@@ -213,6 +214,21 @@ public class DatabaseManager { 
                        deleteDatabase(metadata);

                        deleteDatabase(metadata);

                    }

                    }

                }

                }

                return;

            }



            if (state == BluetoothDevice.BOND_BONDED) {

                if (mMetadataCache.containsKey(address)) {

                    return;

                }

                createMetadata(address, false);

            } else if (state == BluetoothDevice.BOND_NONE) {

                Metadata metadata = mMetadataCache.get(address);

                if (metadata != null) {

                    mMetadataCache.remove(address);

                    deleteDatabase(metadata);

                }

            }

        }

        }

    }

    }