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

Commit e2bd003d authored by Ahmed ElArabawy's avatar Ahmed ElArabawy Committed by Automerger Merge Worker
Browse files

Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11688818

Change-Id: I6465a0af096f7af7f468ea8b94e83e87a6c693a4
parents dba13ac2 7ccfc086

core/proto/android/server/connectivity/data_stall_event.proto

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ enum ApBand { 
    AP_BAND_UNKNOWN = 0;

    AP_BAND_2GHZ = 1;

    AP_BAND_5GHZ = 2;

    AP_BAND_6GHZ = 3;

}



// Refer to definition in TelephonyManager.java.

wifi/java/android/net/wifi/WifiInfo.java

+7 −2
Original line number Diff line number Diff line
@@ -632,7 +632,6 @@ public class WifiInfo implements Parcelable { 


    /**

     * @hide

     * TODO: makes real freq boundaries

     */

    public boolean is24GHz() {

        return ScanResult.is24GHz(mFrequency);
@@ -640,13 +639,19 @@ public class WifiInfo implements Parcelable { 


    /**

     * @hide

     * TODO: makes real freq boundaries

     */

    @UnsupportedAppUsage

    public boolean is5GHz() {

        return ScanResult.is5GHz(mFrequency);

    }



    /**

     * @hide

     */

    public boolean is6GHz() {

        return ScanResult.is6GHz(mFrequency);

    }



    /**

     * Record the MAC address of the WLAN interface

     * @param macAddress the MAC address in {@code XX:XX:XX:XX:XX:XX} form