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

Commit 20e83ccb authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "LE: Do not generate an error if a device is already whitelisted" into klp-dev

parents 41d396a3 3d40d674

system/stack/gatt/gatt_utils.c

+2 −2
Original line number Diff line number Diff line
@@ -2315,7 +2315,7 @@ BOOLEAN gatt_add_bg_dev_list(tGATT_REG *p_reg, BD_ADDR bd_addr, BOOLEAN is_init 
                if (p_dev->gatt_if[i] == gatt_if)

                {

                    GATT_TRACE_ERROR0("device already in iniator white list");

                    break;

                    return TRUE;

                }

                else if (p_dev->gatt_if[i] == 0)

                {
@@ -2332,7 +2332,7 @@ BOOLEAN gatt_add_bg_dev_list(tGATT_REG *p_reg, BD_ADDR bd_addr, BOOLEAN is_init 
                if (p_dev->listen_gif[i] == gatt_if)

                {

                    GATT_TRACE_ERROR0("device already in adv white list");

                    return FALSE;

                    return TRUE;

                }

                else if (p_dev->listen_gif[i] == 0)

                {