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

Commit ee38aead authored by William Escande's avatar William Escande
Browse files

Database: release cache lock before callback 

Bug: 310837813
Fix: 310837813
Test: atest setCustomMetadata_reentrantCallback_noDeadLock
Change-Id: I370a549a24b5a2e8793a394e56de934fa527ebba
parent 928cf290

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

+12 −12
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ public class DatabaseManager { 
     */

    @VisibleForTesting

    public boolean setCustomMeta(BluetoothDevice device, int key, byte[] newValue) {

        synchronized (mMetadataCache) {

        if (device == null) {

            Log.e(TAG, "setCustomMeta: device is null");

            return false;
@@ -242,6 +241,7 @@ public class DatabaseManager { 
        }



        String address = device.getAddress();

        synchronized (mMetadataCache) {

            if (!mMetadataCache.containsKey(address)) {

                createMetadata(address, false);

            }
@@ -256,10 +256,10 @@ public class DatabaseManager { 
            data.setCustomizedMeta(key, newValue);



            updateDatabase(data);

        }

        mAdapterService.metadataChanged(address, key, newValue);

        return true;

    }

    }



    /**

     * Get customized metadata from database with requested key

android/app/tests/unit/src/com/android/bluetooth/btservice/storage/DatabaseManagerTest.java

+35 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertThat; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.times;
@@ -50,6 +51,8 @@ import com.android.bluetooth.btservice.AdapterService; 
import com.android.bluetooth.flags.FakeFeatureFlagsImpl;

import com.android.bluetooth.flags.Flags;



import com.google.common.truth.Truth;



import org.hamcrest.CoreMatchers;

import org.junit.After;

import org.junit.Assert;
@@ -59,10 +62,13 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.stubbing.Answer;



import java.io.IOException;

import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.CompletableFuture;

import java.util.concurrent.TimeUnit;



@MediumTest

@RunWith(AndroidJUnit4.class)
@@ -1687,4 +1693,33 @@ public final class DatabaseManagerTest { 
        // Wait for clear database

        TestUtils.waitForLooperToFinishScheduledTask(mDatabaseManager.getHandlerLooper());

    }



    @Test

    public void setCustomMetadata_reentrantCallback_noDeadLock() throws Exception {

        final int key = 3;

        final byte[] newValue = new byte[2];



        CompletableFuture<byte[]> future = new CompletableFuture();



        Answer answer =

                invocation -> {

                    // Concurrent database call during callback execution

                    byte[] value =

                            CompletableFuture.supplyAsync(

                                            () -> mDatabaseManager.getCustomMeta(mTestDevice, key))

                                    .completeOnTimeout(null, 1, TimeUnit.SECONDS)

                                    .get();



                    future.complete(value);

                    return null;

                };



        doAnswer(answer)

                .when(mAdapterService)

                .metadataChanged(any(String.class), anyInt(), any(byte[].class));



        mDatabaseManager.setCustomMeta(mTestDevice, key, newValue);



        Truth.assertThat(future.get()).isEqualTo(newValue);

    }

}