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

Commit cb31ca4e authored by Nitin Arora's avatar Nitin Arora Committed by android-build-merger
Browse files

Allow full dev consolidation after pairing am: 0afc1b90 

am: 78ff62f9

Change-Id: I4bbb594c4b0a49d7954bedd5dd1b21f5db9b6012
parents 4e45cd3b 78ff62f9

system/stack/btm/btm_dev.cc

+0 −2
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ void btm_consolidate_dev(tBTM_SEC_DEV_REC* p_target_rec) { 


      /* remove the combined record */

      list_remove(btm_cb.sec_dev_rec, p_dev_rec);

      break;

    }



    /* an RPA device entry is a duplicate of the target record */
@@ -419,7 +418,6 @@ void btm_consolidate_dev(tBTM_SEC_DEV_REC* p_target_rec) { 
        /* remove the combined record */

        list_remove(btm_cb.sec_dev_rec, p_dev_rec);

      }

      break;

    }

  }

}