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

Commit e830f2d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Using right type to get return value of As32Bit"

parents 40039193 02b807ef

system/gd/hci/le_scanning_manager.cc

+2 −2
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ struct LeScanningManager::impl : public LeAddressManagerCallback { 
        combined_data.push_back((uint8_t)data);

        combined_data.push_back((uint8_t)(data >> 8));

      } else if (uuid_len == Uuid::kNumBytes32) {

        uint16_t data = uuid.As32Bit();

        uint32_t data = uuid.As32Bit();

        combined_data.push_back((uint8_t)data);

        combined_data.push_back((uint8_t)(data >> 8));

        combined_data.push_back((uint8_t)(data >> 16));
@@ -889,7 +889,7 @@ struct LeScanningManager::impl : public LeAddressManagerCallback { 
          combined_data.push_back((uint8_t)data);

          combined_data.push_back((uint8_t)(data >> 8));

        } else if (uuid_len == Uuid::kNumBytes32) {

          uint16_t data = uuid_mask.As32Bit();

          uint32_t data = uuid_mask.As32Bit();

          combined_data.push_back((uint8_t)data);

          combined_data.push_back((uint8_t)(data >> 8));

          combined_data.push_back((uint8_t)(data >> 16));