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

Commit d7075ba6 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Gerrit Code Review
Browse files

Merge "Remove gatt_cleanup_restricted_handles flag" into main

parents 8c3a2912 08967a04

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

+2 −6
Original line number Diff line number Diff line
@@ -241,9 +241,7 @@ public class GattService extends ProfileService { 
        }

        mAdvertiseManager.clear();

        mClientMap.clear();

        if (Flags.gattCleanupRestrictedHandles()) {

        mRestrictedHandles.clear();

        }

        mServerMap.clear();

        mHandleMap.clear();

        mReliableQueue.clear();
@@ -1355,9 +1353,7 @@ public class GattService extends ProfileService { 
        mClientMap.removeConnection(clientIf, connId);

        ContextMap<IBluetoothGattCallback>.App app = mClientMap.getById(clientIf);



        if (Flags.gattCleanupRestrictedHandles()) {

        mRestrictedHandles.remove(connId);

        }



        // Remove AtomicBoolean representing permit if no other connections rely on this remote

        // device.

android/app/tests/unit/src/com/android/bluetooth/gatt/GattServiceTest.java

+0 −1
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ public class GattServiceTest { 


    @Test

    public void restrictedHandles() throws Exception {

        mSetFlagsRule.enableFlags(Flags.FLAG_GATT_CLEANUP_RESTRICTED_HANDLES);

        int clientIf = 1;

        int connId = 1;

        ArrayList<GattDbElement> db = new ArrayList<>();

flags/gap.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -29,13 +29,6 @@ flag { 
    bug: "317128464"

}



flag {

    name: "gatt_cleanup_restricted_handles"

    namespace: "bluetooth"

    description: "Cleans up restricted handles when disconnected"

    bug: "323110155"

}



flag {

    name: "phy_to_native"

    namespace: "bluetooth"