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

Commit cd80e83a authored by Ahmed ElArabawy's avatar Ahmed ElArabawy
Browse files

Wifi: Add a system api to query for device phy capabilities 

This commit adds the API to query for the device phy capabilities.

Bug: 143543900
Bug: 134688244
Bug: 144576344
Test: atest com.android.wifi.server
Change-Id: I8bff0fb45faaa39a7cd4dd19fe4591ac2e7af3d5
parent 452f8d67

api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -6776,6 +6776,15 @@ package android.net.wifi.rtt { 














package android.net.wifi.wificond {



























  public final class DeviceWiphyCapabilities implements android.os.Parcelable {













    ctor public DeviceWiphyCapabilities();













    method public int describeContents();













    method public boolean isWifiStandardSupported(int);













    method public void setWifiStandardSupport(int, boolean);













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













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













  }



























  public final class NativeScanResult implements android.os.Parcelable {















    method public int describeContents();















    method @NonNull public byte[] getBssid();










@@ -6840,6 +6849,7 @@ package android.net.wifi.wificond {













    method public void abortScan(@NonNull String);















    method public void enableVerboseLogging(boolean);















    method @NonNull public int[] getChannelsMhzForBand(int);













    method @Nullable public android.net.wifi.wificond.DeviceWiphyCapabilities getDeviceWiphyCapabilities(@NonNull String);















    method @NonNull public java.util.List<android.net.wifi.wificond.NativeScanResult> getScanResults(@NonNull String, int);















    method @Nullable public android.net.wifi.wificond.WifiCondManager.TxPacketCounters getTxPacketCounters(@NonNull String);















    method public boolean initialize(@NonNull Runnable);

































wifi/java/android/net/wifi/wificond/DeviceWiphyCapabilities.java
0 → 100644



+160
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2020 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.net.wifi.wificond;



























import android.annotation.NonNull;













import android.annotation.SystemApi;













import android.net.wifi.ScanResult;













import android.os.Parcel;













import android.os.Parcelable;













import android.util.Log;



























import java.util.Objects;



























/**













 * DeviceWiphyCapabilities for wificond













 *













 * @hide













 */













@SystemApi













public final class DeviceWiphyCapabilities implements Parcelable {













    private static final String TAG = "DeviceWiphyCapabilities";



























    private boolean m80211nSupported;













    private boolean m80211acSupported;













    private boolean m80211axSupported;



























    /** public constructor */













    public DeviceWiphyCapabilities() {













        m80211nSupported = false;













        m80211acSupported = false;













        m80211axSupported = false;













    }



























    /**













     * Get the IEEE 802.11 standard support













     *













     * @param standard the IEEE 802.11 standard to check on its support.













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













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













     */













    public boolean isWifiStandardSupported(int standard) {













        switch (standard) {













            case ScanResult.WIFI_STANDARD_LEGACY:













                return true;













            case ScanResult.WIFI_STANDARD_11N:













                return m80211nSupported;













            case ScanResult.WIFI_STANDARD_11AC:













                return m80211acSupported;













            case ScanResult.WIFI_STANDARD_11AX:













                return m80211axSupported;













            default:













                Log.e(TAG, "isWifiStandardSupported called with invalid standard: " + standard);













                return false;













        }













    }



























    /**













     * Set the IEEE 802.11 standard support













     *













     * @param standard the IEEE 802.11 standard to set its support.













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













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













     */













    public void setWifiStandardSupport(int standard, boolean support) {













        switch (standard) {













            case ScanResult.WIFI_STANDARD_11N:













                m80211nSupported = support;













                break;













            case ScanResult.WIFI_STANDARD_11AC:













                m80211acSupported = support;













                break;













            case ScanResult.WIFI_STANDARD_11AX:













                m80211axSupported = support;













                break;













            default:













                Log.e(TAG, "setWifiStandardSupport called with invalid standard: " + standard);













        }













    }



























    /** override comparator */













    @Override













    public boolean equals(Object rhs) {













        if (this == rhs) return true;













        if (!(rhs instanceof DeviceWiphyCapabilities)) {













            return false;













        }













        DeviceWiphyCapabilities capa = (DeviceWiphyCapabilities) rhs;



























        return m80211nSupported == capa.m80211nSupported













                && m80211acSupported == capa.m80211acSupported













                && m80211axSupported == capa.m80211axSupported;













    }



























    /** override hash code */













    @Override













    public int hashCode() {













        return Objects.hash(m80211nSupported, m80211acSupported, m80211axSupported);













    }



























    /** implement Parcelable interface */













    @Override













    public int describeContents() {













        return 0;













    }



























    /**













     * implement Parcelable interface













     * |flags| is ignored.













     */













    @Override













    public void writeToParcel(@NonNull Parcel out, int flags) {













        out.writeBoolean(m80211nSupported);













        out.writeBoolean(m80211acSupported);













        out.writeBoolean(m80211axSupported);













    }



























    @Override













    public String toString() {













        StringBuilder sb = new StringBuilder();













        sb.append("m80211nSupported:").append(m80211nSupported ? "Yes" : "No");













        sb.append("m80211acSupported:").append(m80211acSupported ? "Yes" : "No");













        sb.append("m80211axSupported:").append(m80211axSupported ? "Yes" : "No");













        return sb.toString();













    }



























    /** implement Parcelable interface */













    public static final @NonNull Parcelable.Creator<DeviceWiphyCapabilities> CREATOR =













            new Parcelable.Creator<DeviceWiphyCapabilities>() {













        /**













         * Caller is responsible for providing a valid parcel.













         */













        @Override













        public DeviceWiphyCapabilities createFromParcel(Parcel in) {













            DeviceWiphyCapabilities capabilities = new DeviceWiphyCapabilities();













            capabilities.m80211nSupported = in.readBoolean();













            capabilities.m80211acSupported = in.readBoolean();













            capabilities.m80211axSupported = in.readBoolean();













            return capabilities;













        }



























        @Override













        public DeviceWiphyCapabilities[] newArray(int size) {













            return new DeviceWiphyCapabilities[size];













        }













    };













}
























wifi/java/android/net/wifi/wificond/WifiCondManager.java



+16
−0




























Original line number
Diff line number
Diff line








@@ -1051,6 +1051,22 @@ public class WifiCondManager {













        return mApInterfaces.get(ifaceName);















    }





























    /**













     * Get the device phy capabilities for a given interface













     */













    @Nullable public DeviceWiphyCapabilities getDeviceWiphyCapabilities(@NonNull String ifaceName) {













        if (mWificond == null) {













            Log.e(TAG, "Can not query for device wiphy capabilities at this time");













            return null;













        }



























        try {













            return mWificond.getDeviceWiphyCapabilities(ifaceName);













        } catch (RemoteException e) {













            return null;













        }













    }





























    /**















     * Register the provided callback handler for SoftAp events. Note that the Soft AP itself is















     * configured using {@link #setupInterfaceForSoftApMode(String)}.

































wifi/tests/src/android/net/wifi/wificond/DeviceWiphyCapabilitiesTest.java
0 → 100644



+59
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2020 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.net.wifi.wificond;



























import static org.junit.Assert.assertEquals;



























import android.net.wifi.ScanResult;













import android.os.Parcel;



























import androidx.test.filters.SmallTest;



























import org.junit.Before;













import org.junit.Test;



























/**













 * Unit tests for {@link android.net.wifi.wificond.DeviceWiphyCapabilities}.













 */













@SmallTest













public class DeviceWiphyCapabilitiesTest {













    @Before













    public void setUp() {}



























    /**













     *  DeviceWiphyCapabilities object can be serialized and deserialized, while keeping the













     *  values unchanged.













     */













    @Test













    public void canSerializeAndDeserialize() {













        DeviceWiphyCapabilities capa = new DeviceWiphyCapabilities();



























        capa.setWifiStandardSupport(ScanResult.WIFI_STANDARD_11N, true);













        capa.setWifiStandardSupport(ScanResult.WIFI_STANDARD_11AC, true);













        capa.setWifiStandardSupport(ScanResult.WIFI_STANDARD_11AX, false);



























        Parcel parcel = Parcel.obtain();













        capa.writeToParcel(parcel, 0);













        // Rewind the pointer to the head of the parcel.













        parcel.setDataPosition(0);













        DeviceWiphyCapabilities capaDeserialized =













                DeviceWiphyCapabilities.CREATOR.createFromParcel(parcel);



























        assertEquals(capa, capaDeserialized);













        assertEquals(capa.hashCode(), capaDeserialized.hashCode());













    }













}
























wifi/tests/src/android/net/wifi/wificond/WifiCondManagerTest.java



+20
−1




























Original line number
Diff line number
Diff line








@@ -38,6 +38,7 @@ import static org.mockito.Mockito.when;













import android.app.AlarmManager;















import android.app.test.TestAlarmManager;















import android.content.Context;













import android.net.wifi.ScanResult;















import android.net.wifi.SoftApInfo;















import android.net.wifi.WifiConfiguration;















import android.net.wifi.WifiScanner;










@@ -397,7 +398,6 @@ public class WifiCondManagerTest {













        verify(mWifiScannerImpl).unsubscribeScanEvents();















    }













































    /**















     * Verifies that tearDownInterfaces() returns false when wificond is not started.















     */










@@ -1036,6 +1036,25 @@ public class WifiCondManagerTest {













        verify(mSendMgmtFrameCallback).onFailure(WifiCondManager.SEND_MGMT_FRAME_ERROR_TIMEOUT);















    }





























    /**













     * Tests getDeviceWiphyCapabililties













     */













    @Test













    public void testGetDeviceWiphyCapabilities() throws Exception {













        DeviceWiphyCapabilities capaExpected = new DeviceWiphyCapabilities();



























        capaExpected.setWifiStandardSupport(ScanResult.WIFI_STANDARD_11N, true);













        capaExpected.setWifiStandardSupport(ScanResult.WIFI_STANDARD_11AC, true);













        capaExpected.setWifiStandardSupport(ScanResult.WIFI_STANDARD_11AX, false);



























        when(mWificond.getDeviceWiphyCapabilities(TEST_INTERFACE_NAME))













                .thenReturn(capaExpected);



























        DeviceWiphyCapabilities capaActual =













                mWificondControl.getDeviceWiphyCapabilities(TEST_INTERFACE_NAME);













        assertEquals(capaExpected, capaActual);













    }





























    // Create a ArgumentMatcher which captures a SingleScanSettings parameter and checks if it















    // matches the provided frequency set and ssid set.















    private class ScanMatcher implements ArgumentMatcher<SingleScanSettings> {