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

Commit 37d547dc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Sdp: [ALPS07785324] initialize service_id to 0" into main am: 00277194 am: 06cf8e61 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2995326



Change-Id: Iabd555eb474abd51fe5f0b78082b6388585a81dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ddcf55e9 06cf8e61

system/btif/src/btif_sdp_server.cc

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ bt_status_t remove_sdp_record(int record_id) { 
      sdp_type = record->hdr.type;

    }

  }

  tBTA_SERVICE_ID service_id = -1;

  tBTA_SERVICE_ID service_id = 0;

  switch (sdp_type) {

    case SDP_TYPE_MAP_MAS:

      service_id = BTA_MAP_SERVICE_ID;
@@ -363,7 +363,7 @@ void on_create_record_event(int id) { 
   * */

  log::verbose("Sdp Server");

  const sdp_slot_t* sdp_slot = start_create_sdp(id);

  tBTA_SERVICE_ID service_id = -1;

  tBTA_SERVICE_ID service_id = 0;

  bluetooth_sdp_record* record;

  /* In the case we are shutting down, sdp_slot is NULL */

  if (sdp_slot != nullptr && (record = sdp_slot->record_data) != nullptr) {