Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate existing Build.VERSION.SDK_INT checks to SdkLevelUtil"

Browse Source
This commit is contained in:
David Su
2020-09-09 02:57:27 +00:00
committed by Android (Google) Code Review
parent 96eefda22e dbb9de683d
commit 3a8a26fb38
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/SoftApCapability.java
View File

@@ -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) {

6
wifi/java/android/net/wifi/SoftApConfiguration.java
View File

@@ -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;

4
wifi/java/android/net/wifi/SoftApInfo.java
View File

@@ -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;

7
wifi/java/android/net/wifi/util/SdkLevelUtil.java
View File

@@ -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;`