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

Commit 6b0b8669 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[AWARE] Fix type of channel width to use enumeration"

parents 3a7d1e59 b1b7a82c

wifi/1.2/default/hidl_struct_util.cpp

+5 −1
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ namespace V1_2 { 
namespace implementation {

namespace hidl_struct_util {



WifiChannelWidthInMhz convertLegacyWifiChannelWidthToHidl(

    legacy_hal::wifi_channel_width type);



hidl_string safeConvertChar(const char* str, size_t max_len) {

    const char* c = str;

    size_t size = 0;
@@ -2044,7 +2047,8 @@ bool convertLegacyNdpChannelInfoToHidl( 
    *hidl_struct = {};



    hidl_struct->channelFreq = legacy_struct.channel;

    hidl_struct->channelBandwidth = legacy_struct.bandwidth;

    hidl_struct->channelBandwidth = convertLegacyWifiChannelWidthToHidl(

        (legacy_hal::wifi_channel_width)legacy_struct.bandwidth);

    hidl_struct->numSpatialStreams = legacy_struct.nss;



    return true;

wifi/1.2/types.hal

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.hardware.wifi@1.2; 
import @1.0::MacAddress;

import @1.0::NanDataPathConfirmInd;

import @1.0::WifiChannelInMhz;

import @1.0::WifiChannelWidthInMhz;



/**

 * NAN configuration request parameters added in the 1.2 HAL. These are supplemental to previous
@@ -67,7 +68,7 @@ struct NanDataPathChannelInfo { 
    /**

     * Channel bandwidth in MHz.

     */

    uint32_t channelBandwidth;

    WifiChannelWidthInMhz channelBandwidth;

    /**

     * Number of spatial streams used in the channel.

     */