commit be6ac81ec2592e57650e5381f83b8ba4c21ae0e1
author Chris Manton <cmanton@google.com> Sun Aug 09 09:11:44 2020 -0700
committer Chris Manton <cmanton@google.com> Sun Aug 09 23:36:12 2020 +0000
tree 26885e4d19dabad1a13a0c17f465a54de83003cf
parent fd854e275f911e5ddb50519581ef911d84b0feb4

Remove incorrect and useless cached data type

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2e62c052be21a96188bfb6c2f00d094c5d401935

system/stack/btm/btm_ble_addr.cc

diff --git a/system/stack/btm/btm_ble_addr.cc b/system/stack/btm/btm_ble_addr.cc
index 4f035ab..7b8a1b9 100644
--- a/system/stack/btm/btm_ble_addr.cc
+++ b/system/stack/btm/btm_ble_addr.cc
@@ -315,9 +315,6 @@
                                                   const RawAddress& rpa,
                                                   uint8_t rra_type) {
 #if (BLE_PRIVACY_SPT == TRUE)
-  uint8_t rra_dummy = false;
-  if (rpa.IsEmpty()) rra_dummy = true;
-
   /* update security record here, in adv event or connection complete process */
   tBTM_SEC_DEV_REC* p_sec_rec = btm_find_dev(pseudo_bda);
   if (p_sec_rec != NULL) {
@@ -326,7 +323,7 @@
     /* unknown, if dummy address, set to static */
     if (rra_type == BTM_BLE_ADDR_PSEUDO)
       p_sec_rec->ble.active_addr_type =
-          rra_dummy ? BTM_BLE_ADDR_STATIC : BTM_BLE_ADDR_RRA;
+          rpa.IsEmpty() ? BTM_BLE_ADDR_STATIC : BTM_BLE_ADDR_RRA;
     else
       p_sec_rec->ble.active_addr_type = rra_type;
   } else {
@@ -345,7 +342,7 @@
   if (p_acl != NULL) {
     if (rra_type == BTM_BLE_ADDR_PSEUDO) {
       /* use identity address, resolvable_private_addr is empty */
-      if (rra_dummy) {
+      if (rpa.IsEmpty()) {
         p_acl->active_remote_addr_type = p_sec_rec->ble.identity_addr_type;
         p_acl->active_remote_addr = p_sec_rec->ble.identity_addr;
       } else {