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

Commit 2c818b8e authored by William Escande's avatar William Escande
Browse files

SdpManager: delete unused singleton 

Bug: 323672160
Test: atest BluetoothInstrumentationTests
Change-Id: I6f3eef3988579a0219fec9313b0830a369f5608a
parent 37d90a00

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ public class AdapterService extends Service { 
                        "BluetoothQualityReportNativeInterface cannot be null when BQR starts");

        mBluetoothQualityReportNativeInterface.init();



        mSdpManager = SdpManager.init(this);

        mSdpManager = new SdpManager(this);



        mDatabaseManager = new DatabaseManager(this);

        mDatabaseManager.start(MetadataDatabase.createDatabase(this));

android/app/src/com/android/bluetooth/sdp/SdpManager.java

+2 −17
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ public class SdpManager { 
    private static AdapterService sAdapterService;

    private static boolean sNativeAvailable;



    // This object is a singleton

    private static SdpManager sSdpManager = null;



    private final SdpManagerNativeInterface mNativeInterface =

            SdpManagerNativeInterface.getInstance();
@@ -128,7 +125,7 @@ public class SdpManager { 
     * As we use a mix of byte[] and object instances, this is more

     * efficient than implementing comparable. */

    class SdpSearchTracker {

        private final ArrayList<SdpSearchInstance> mList = new ArrayList<SdpSearchInstance>();

        private final ArrayList<SdpSearchInstance> mList = new ArrayList<>();



        void clear() {

            mList.clear();
@@ -176,24 +173,13 @@ public class SdpManager { 
        }

    }





    private SdpManager(AdapterService adapterService) {

    public SdpManager(AdapterService adapterService) {

        sSdpSearchTracker = new SdpSearchTracker();

        sAdapterService = adapterService;

        mNativeInterface.init(this);

        sNativeAvailable = true;

    }





    public static SdpManager init(AdapterService adapterService) {

        sSdpManager = new SdpManager(adapterService);

        return sSdpManager;

    }



    public static SdpManager getDefaultManager() {

        return sSdpManager;

    }



    public void cleanup() {

        if (sSdpSearchTracker != null) {

            synchronized (TRACKER_LOCK) {
@@ -205,7 +191,6 @@ public class SdpManager { 
            mNativeInterface.cleanup();

            sNativeAvailable = false;

        }

        sSdpManager = null;

    }

android/app/tests/unit/src/com/android/bluetooth/sdp/DipTest.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class DipTest { 
        }



        mAdapter = BluetoothAdapter.getDefaultAdapter();

        mSdpManager = SdpManager.init(mAdapterService);

        mSdpManager = new SdpManager(mAdapterService);



        // Get a device for testing

        mTestDevice = mAdapter.getRemoteDevice("00:01:02:03:04:05");