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

Commit dbb9de68 authored by David Su's avatar David Su
Browse files

Migrate existing Build.VERSION.SDK_INT checks to SdkLevelUtil 

Bug: 154742276
Test: atest FrameworksWifiApiTests
Change-Id: Ib680d859e2345e100c705865da55c8fc117a1861
parent cb396caa

wifi/java/android/net/wifi/SoftApCapability.java

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.net.wifi.SoftApConfiguration.BandType;

import android.os.Build;

import android.net.wifi.util.SdkLevelUtil;

import android.os.Parcel;

import android.os.Parcelable;
@@ -176,7 +176,7 @@ public final class SoftApCapability implements Parcelable { 
     */

    @NonNull

    public int[] getSupportedChannelList(@BandType int band) {

        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {

        if (!SdkLevelUtil.isAtLeastS()) {

            throw new UnsupportedOperationException();

        }

        switch (band) {

wifi/java/android/net/wifi/SoftApConfiguration.java

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.net.MacAddress;

import android.os.Build;

import android.net.wifi.util.SdkLevelUtil;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;
@@ -551,7 +551,7 @@ public final class SoftApConfiguration implements Parcelable { 
    @SystemApi

    @MacRandomizationSetting

    public int getMacRandomizationSetting() {

        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {

        if (!SdkLevelUtil.isAtLeastS()) {

            throw new UnsupportedOperationException();

        }

        return mMacRandomizationSetting;
@@ -1046,7 +1046,7 @@ public final class SoftApConfiguration implements Parcelable { 
        @NonNull

        public Builder setMacRandomizationSetting(

                @MacRandomizationSetting int macRandomizationSetting) {

            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {

            if (!SdkLevelUtil.isAtLeastS()) {

                throw new UnsupportedOperationException();

            }

            mMacRandomizationSetting = macRandomizationSetting;

wifi/java/android/net/wifi/SoftApInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.net.MacAddress;

import android.os.Build;

import android.net.wifi.util.SdkLevelUtil;

import android.os.Parcel;

import android.os.Parcelable;
@@ -138,7 +138,7 @@ public final class SoftApInfo implements Parcelable { 
     */

    @Nullable

    public MacAddress getBssid() {

        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {

        if (!SdkLevelUtil.isAtLeastS()) {

            throw new UnsupportedOperationException();

        }

        return mBssid;

wifi/java/android/net/wifi/util/SdkLevelUtil.java

+6 −1
Original line number Diff line number Diff line
@@ -30,8 +30,13 @@ public class SdkLevelUtil { 
    /** This class is instantiable to allow easy mocking. */

    public SdkLevelUtil() { }



    /** See {@link #isAtLeastS()}. This version is non-static to allow easy mocking. */

    public boolean isAtLeastSMockable() {

        return isAtLeastS();

    }



    /** Returns true if the Android platform SDK is at least "S", false otherwise. */

    public boolean isAtLeastS() {

    public static boolean isAtLeastS() {

        // TODO(b/167575586): after S SDK finalization, this method should just be

        //  `return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;`