commit 3b6ef54cd262da6a41a16dafe361040740024717
author Jacky Cheung <jackyc@google.com> Fri Mar 04 13:29:02 2016 -0800
committer Andre Eisenbach <eisenbach@google.com> Fri Mar 04 21:53:22 2016 +0000
tree 307a48ba1e589866c2fa4a562e4e4f3fdbac67e7
parent bf955cb7e50e1047452e741effa504c8aefc8a4f

Default missing DevType and DevClass in NVRAM.

Missing DevType and DevClass in NVRAM were not properly set to a
default values previously.

btif/src/btif_storage.c

diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index a9e4c94..0fb1b91 100644
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -871,7 +871,6 @@
     uint32_t disc_timeout;
     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);
 
@@ -936,6 +935,12 @@
         {
             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));