diff --git a/wifi/java/android/net/wifi/SoftApCapability.java b/wifi/java/android/net/wifi/SoftApCapability.java
index 99c4eac7977b4..cf54f26fc5e44 100644
--- a/wifi/java/android/net/wifi/SoftApCapability.java
+++ b/wifi/java/android/net/wifi/SoftApCapability.java
@@ -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) {
diff --git a/wifi/java/android/net/wifi/SoftApConfiguration.java b/wifi/java/android/net/wifi/SoftApConfiguration.java
index 393fe8d3ab9a1..bc837b3c344d7 100644
--- a/wifi/java/android/net/wifi/SoftApConfiguration.java
+++ b/wifi/java/android/net/wifi/SoftApConfiguration.java
@@ -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;
diff --git a/wifi/java/android/net/wifi/SoftApInfo.java b/wifi/java/android/net/wifi/SoftApInfo.java
index 4791275cdce59..40981f7b0fb13 100644
--- a/wifi/java/android/net/wifi/SoftApInfo.java
+++ b/wifi/java/android/net/wifi/SoftApInfo.java
@@ -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;
diff --git a/wifi/java/android/net/wifi/util/SdkLevelUtil.java b/wifi/java/android/net/wifi/util/SdkLevelUtil.java
index f29b0a6f36117..042634c7125cd 100644
--- a/wifi/java/android/net/wifi/util/SdkLevelUtil.java
+++ b/wifi/java/android/net/wifi/util/SdkLevelUtil.java
@@ -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;`