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

Commit c46a70e8 authored by Jacky Cheung's avatar Jacky Cheung Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM." into cw-e-dev

parents b6bcd5dc 890d081c

system/btif/src/btif_storage.c

+6 −1
Original line number Diff line number Diff line
@@ -870,7 +870,6 @@ bt_status_t btif_storage_load_bonded_devices(void) 
    bt_bdaddr_t *devices_list;

    bt_uuid_t local_uuids[BT_MAX_NUM_UUIDS];

    bt_uuid_t remote_uuids[BT_MAX_NUM_UUIDS];

    uint32_t cod, devtype;



    btif_in_fetch_bonded_devices(&bonded_devices, 1);
@@ -934,6 +933,12 @@ bt_status_t btif_storage_load_bonded_devices(void) 
        {

            bt_bdaddr_t *p_remote_addr;



            /*

             * TODO: improve handling of missing fields in NVRAM.

             */

            uint32_t cod = 0;

            uint32_t devtype = 0;



            num_props = 0;

            p_remote_addr = &bonded_devices.devices[i];

            memset(remote_properties, 0, sizeof(remote_properties));