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

Commit b7cffe32 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "wifi: Fetch the gscan bucket idx from request" am: f297caed 

am: 3f08d19f

Change-Id: I01abda5debed55f8e980578b7a36f8a402627ee3
parents f75584ca 3f08d19f

wifi/1.0/default/hidl_struct_util.cpp

+4 −1
Original line number Diff line number Diff line
@@ -354,7 +354,10 @@ bool convertHidlGscanParamsToLegacy( 
        hidl_scan_params.buckets[bucket_idx];

    legacy_hal::wifi_scan_bucket_spec& legacy_bucket_spec =

        legacy_scan_params->buckets[bucket_idx];

    legacy_bucket_spec.bucket = bucket_idx;

    if (hidl_bucket_spec.bucketIdx >= MAX_BUCKETS) {

      return false;

    }

    legacy_bucket_spec.bucket = hidl_bucket_spec.bucketIdx;

    legacy_bucket_spec.band =

        convertHidlWifiBandToLegacy(hidl_bucket_spec.band);

    legacy_bucket_spec.period = hidl_bucket_spec.periodInMs;

wifi/1.0/types.hal

+5 −0
Original line number Diff line number Diff line
@@ -319,6 +319,11 @@ enum StaScanLimits : uint32_t { 
 * scan requests.

 */

struct StaBackgroundScanBucketParameters {

  /**

   * Bucket index. This index is used to report results in

   * |StaScanData.bucketsScanned|.

   */

  uint32_t bucketIdx;

  /**

   * Bands to scan or |BAND_UNSPECIFIED| if frequencies list must be used

   * instead.