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

Commit 872d6665 authored by Kai Shi's avatar Kai Shi Committed by Android (Google) Code Review
Browse files

Merge "Wifi: add 3 new fields to ConnectionCapabilities."

parents 758b8941 5e12b963

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 
8aed0a8e03e7a67bfdfb78ad7529a9ae95bea36e6060473b204c89d772522126 android.hardware.wifi.supplicant@1.3::ISupplicantStaIface

def77c7db95d374f11a111bfc4ed60f92451303642a43276c4e291988fcee625 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback

62cf050c593c1ec34b49178b5bdde72dd9b80d9bad3eb184e4f0cd564d28678c android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork

91015479f5a0fba9872e98d3cca4680995de64f42ae71461b4b7e5acc5a196ab android.hardware.wifi.supplicant@1.3::types

98592d193a717066facf91428426e5abe211e3bd718bc372e29fb944ddbe6e7c android.hardware.wifi.supplicant@1.3::types

##

# BEGIN Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present

##

wifi/supplicant/1.3/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ hidl_interface { 
        "android.hardware.wifi.supplicant@1.0",

        "android.hardware.wifi.supplicant@1.1",

        "android.hardware.wifi.supplicant@1.2",

        "android.hardware.wifi@1.0",

        "android.hidl.base@1.0",

    ],

    gen_java: true,

wifi/supplicant/1.3/types.hal

+15 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package android.hardware.wifi.supplicant@1.3; 
import @1.2::DppProgressCode;

import @1.2::DppFailureCode;



import android.hardware.wifi@1.0::WifiChannelWidthInMhz;



/**

 * OcspType: The type of OCSP request.

 */
@@ -53,13 +55,25 @@ enum WifiTechnology : uint32_t { 
};



/**

 * Connection Capabilities.

 * Connection Capabilities supported by current network and device

 */

struct ConnectionCapabilities {

    /**

     * Wifi Technology

     */

    WifiTechnology technology;

    /**

     * channel bandwidth

     */

    WifiChannelWidthInMhz channelBandwidth;

    /**

     * max number of Tx spatial streams

     */

    uint32_t maxNumberTxSpatialStreams;

    /**

     * max number of Rx spatial streams

     */

    uint32_t maxNumberRxSpatialStreams;

};



/**