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

Commit bbe5c81e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Wifi: Add some interface annotations" into rvc-dev am: 30caf3d2 am: 27e865a3 

Change-Id: I86d32b3d8672e14fb4dc47a8a36f48dac04daf56
parents e46674ff 27e865a3

api/system-current.txt

+0 −3
Original line number Original line Diff line number Diff line
@@ -7815,9 +7815,6 @@ package android.net.wifi.nl80211 { 
    method public int getMaxNumberTxSpatialStreams();

    method public int getMaxNumberTxSpatialStreams();

    method public boolean isChannelWidthSupported(int);

    method public boolean isChannelWidthSupported(int);

    method public boolean isWifiStandardSupported(int);

    method public boolean isWifiStandardSupported(int);

    method public void setChannelWidthSupported(int, boolean);

    method public void setMaxNumberRxSpatialStreams(int);

    method public void setMaxNumberTxSpatialStreams(int);

    method public void setWifiStandardSupport(int, boolean);

    method public void setWifiStandardSupport(int, boolean);

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.nl80211.DeviceWiphyCapabilities> CREATOR;

    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.nl80211.DeviceWiphyCapabilities> CREATOR;

wifi/java/android/net/wifi/ScanResult.java

+3 −15
Original line number Original line Diff line number Diff line
@@ -16,16 +16,15 @@ 




package android.net.wifi;

package android.net.wifi;





import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.wifi.WifiAnnotations.ChannelWidth;

import android.net.wifi.WifiAnnotations.WifiStandard;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;





import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.nio.ByteBuffer;

import java.nio.ByteBuffer;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;
@@ -313,17 +312,6 @@ public class ScanResult implements Parcelable { 
     */

     */

    public static final int WIFI_STANDARD_11AX = 6;

    public static final int WIFI_STANDARD_11AX = 6;





    /** @hide */

    @IntDef(prefix = { "WIFI_STANDARD_" }, value = {

            WIFI_STANDARD_UNKNOWN,

            WIFI_STANDARD_LEGACY,

            WIFI_STANDARD_11N,

            WIFI_STANDARD_11AC,

            WIFI_STANDARD_11AX

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface WifiStandard{}



    /**

    /**

     * AP wifi standard.

     * AP wifi standard.

     */

     */
@@ -368,7 +356,7 @@ public class ScanResult implements Parcelable { 
     * {@link #CHANNEL_WIDTH_80MHZ}, {@link #CHANNEL_WIDTH_160MHZ}

     * {@link #CHANNEL_WIDTH_80MHZ}, {@link #CHANNEL_WIDTH_160MHZ}

     * or {@link #CHANNEL_WIDTH_80MHZ_PLUS_MHZ}.

     * or {@link #CHANNEL_WIDTH_80MHZ_PLUS_MHZ}.

     */

     */

    public int channelWidth;

    public @ChannelWidth int channelWidth;





    /**

    /**

     * Not used if the AP bandwidth is 20 MHz

     * Not used if the AP bandwidth is 20 MHz

wifi/java/android/net/wifi/WifiAnnotations.java

+20 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,26 @@ public final class WifiAnnotations { 
    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface Bandwidth {}

    public @interface Bandwidth {}





    @IntDef(prefix = { "CHANNEL_WIDTH_" }, value = {

            ScanResult.CHANNEL_WIDTH_20MHZ,

            ScanResult.CHANNEL_WIDTH_40MHZ,

            ScanResult.CHANNEL_WIDTH_80MHZ,

            ScanResult.CHANNEL_WIDTH_160MHZ,

            ScanResult.CHANNEL_WIDTH_80MHZ_PLUS_MHZ,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ChannelWidth{}



    @IntDef(prefix = { "WIFI_STANDARD_" }, value = {

            ScanResult.WIFI_STANDARD_UNKNOWN,

            ScanResult.WIFI_STANDARD_LEGACY,

            ScanResult.WIFI_STANDARD_11N,

            ScanResult.WIFI_STANDARD_11AC,

            ScanResult.WIFI_STANDARD_11AX,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface WifiStandard{}



    @IntDef(prefix = { "PROTOCOL_" }, value = {

    @IntDef(prefix = { "PROTOCOL_" }, value = {

            ScanResult.PROTOCOL_NONE,

            ScanResult.PROTOCOL_NONE,

            ScanResult.PROTOCOL_WPA,

            ScanResult.PROTOCOL_WPA,

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ public class WifiInfo implements Parcelable { 
    /**

    /**

     * Wi-Fi standard for the connection

     * Wi-Fi standard for the connection

     */

     */

    private @ScanResult.WifiStandard int mWifiStandard;

    private @WifiAnnotations.WifiStandard int mWifiStandard;





    /**

    /**

     * The unit in which links speeds are expressed.

     * The unit in which links speeds are expressed.
@@ -518,7 +518,7 @@ public class WifiInfo implements Parcelable { 
     * Sets the Wi-Fi standard

     * Sets the Wi-Fi standard

     * @hide

     * @hide

     */

     */

    public void setWifiStandard(@ScanResult.WifiStandard int wifiStandard) {

    public void setWifiStandard(@WifiAnnotations.WifiStandard int wifiStandard) {

        mWifiStandard = wifiStandard;

        mWifiStandard = wifiStandard;

    }

    }
@@ -526,7 +526,7 @@ public class WifiInfo implements Parcelable { 
     * Get connection Wi-Fi standard

     * Get connection Wi-Fi standard

     * @return the connection Wi-Fi standard

     * @return the connection Wi-Fi standard

     */

     */

    public @ScanResult.WifiStandard int getWifiStandard() {

    public @WifiAnnotations.WifiStandard int getWifiStandard() {

        return mWifiStandard;

        return mWifiStandard;

    }

    }

wifi/java/android/net/wifi/WifiManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2563,7 +2563,7 @@ public class WifiManager { 
     *        valid values from {@link ScanResult}'s {@code WIFI_STANDARD_}

     *        valid values from {@link ScanResult}'s {@code WIFI_STANDARD_}

     * @return {@code true} if supported, {@code false} otherwise.

     * @return {@code true} if supported, {@code false} otherwise.

     */

     */

    public boolean isWifiStandardSupported(@ScanResult.WifiStandard int standard) {

    public boolean isWifiStandardSupported(@WifiAnnotations.WifiStandard int standard) {

        try {

        try {

            return mService.isWifiStandardSupported(standard);

            return mService.isWifiStandardSupported(standard);

        } catch (RemoteException e) {

        } catch (RemoteException e) {