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

Commit 3aa2c068 authored by Barry Wang's avatar Barry Wang Committed by Automerger Merge Worker
Browse files

Merge "add BQR version check to avoid size mismatch error" into main am: 0dd75b90 am: c78f9f4c 

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



Change-Id: I2428feca16c226fceefe270a4184e76b8f27ef75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 643c9e03 c78f9f4c

system/btif/src/btif_bqr.cc

+22 −18
Original line number Original line Diff line number Diff line
@@ -725,31 +725,35 @@ static void CategorizeBqrEvent(uint8_t length, const uint8_t* p_bqr_event) { 
      break;

      break;





    case QUALITY_REPORT_ID_ENERGY_MONITOR:

    case QUALITY_REPORT_ID_ENERGY_MONITOR:

      if (com::android::bluetooth::flags::support_bluetooth_quality_report_v6()) {

        if (vendor_cap_supported_version >= kBqrVersion6_0) {

          if (length < kEnergyMonitorParamTotalLen) {

          if (length < kEnergyMonitorParamTotalLen) {

            log::fatal(

            log::fatal(

                "Parameter total length: {} is abnormal. It shall be not shorter "

                    "Event {} Parameter total length: {} is abnormal. It shall be not shorter "

                    "than: {}",

                    "than: {}",

                length, kEnergyMonitorParamTotalLen);

                    quality_report_id, length, kEnergyMonitorParamTotalLen);

            return;

            return;

          }

          }





      if (com::android::bluetooth::flags::support_bluetooth_quality_report_v6()) {

          AddEnergyMonitorEventToQueue(length, p_bqr_event);

          AddEnergyMonitorEventToQueue(length, p_bqr_event);

        }

        }

      }

      break;

      break;





    case QUALITY_REPORT_ID_RF_STATS:

    case QUALITY_REPORT_ID_RF_STATS:

      if (com::android::bluetooth::flags::support_bluetooth_quality_report_v6()) {

        if (vendor_cap_supported_version >= kBqrVersion6_0) {

          if (length < kRFStatsParamTotalLen) {

          if (length < kRFStatsParamTotalLen) {

            log::fatal(

            log::fatal(

                "Parameter total length: {} is abnormal. It shall be not shorter "

                    "Event {} Parameter total length: {} is abnormal. It shall be not shorter "

                    "than: {}",

                    "than: {}",

                length, kRFStatsParamTotalLen);

                    quality_report_id, length, kEnergyMonitorParamTotalLen);

            return;

            return;

          }

          }





      if (com::android::bluetooth::flags::support_bluetooth_quality_report_v6()) {

          AddRFStatsEventToQueue(length, p_bqr_event);

          AddRFStatsEventToQueue(length, p_bqr_event);

        }

        }

      }

      break;

      break;





    default:

    default: