Merge "Migrate wifi.SdkLevelUtil to com.android.modules.utils.build.SdkLevel" (e29947cb) · Commits · e / os / android_frameworks_base

wifi/Android.bp

+17 −19

Original line number	Diff line number	Diff line
		@@ -75,25 +75,34 @@ test_access_hidden_api_whitelist = [
		"//external/sl4a:__subpackages__",
		]

		// wifi-service needs pre-jarjared version of framework-wifi so it can reference copied utility
		// classes before they are renamed.
		java_library {
		name: "framework-wifi-pre-jarjar",
		// defaults shared between `framework-wifi` & `framework-wifi-pre-jarjar`
		// java_sdk_library `framework-wifi` needs sources to generate stubs, so it cannot reuse
		// `framework-wifi-pre-jarjar`
		java_defaults {
		name: "framework-wifi-defaults",
		defaults: ["wifi-module-sdk-version-defaults"],
		sdk_version: "module_current",
		static_libs: [
		"framework-wifi-util-lib",
		"android.hardware.wifi-V1.0-java-constants",
		"modules-utils-build",
		],
		libs: [
		"framework-annotations-lib",
		"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
		],
		srcs: [
		":framework-wifi-updatable-sources",
		":framework-wifi-util-lib-aidls",
		],
		// java_api_finder must accompany `srcs`
		}

		// wifi-service needs pre-jarjared version of framework-wifi so it can reference copied utility
		// classes before they are renamed.
		java_library {
		name: "framework-wifi-pre-jarjar",
		defaults: ["framework-wifi-defaults"],
		sdk_version: "module_current",
		libs: ["framework-annotations-lib"],
		// java_api_finder must accompany `srcs` (`srcs` defined in `framework-wifi-defaults`)
		plugins: ["java_api_finder"],
		installable: false,
		visibility: [
		@@ -107,18 +116,7 @@ java_sdk_library {
		name: "framework-wifi",
		defaults: [
		"framework-module-defaults",
		"wifi-module-sdk-version-defaults",
		],
		static_libs: [
		"framework-wifi-util-lib",
		"android.hardware.wifi-V1.0-java-constants",
		],
		libs: [
		"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
		],
		srcs: [
		":framework-wifi-updatable-sources",
		":framework-wifi-util-lib-aidls",
		"framework-wifi-defaults",
		],

		jarjar_rules: ":wifi-jarjar-rules",

wifi/jarjar-rules.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -123,3 +123,4 @@ rule com.android.internal.util.Preconditions* com.android.wifi.x.@0
		rule com.android.internal.util.Protocol* com.android.wifi.x.@0

		rule com.android.net.module.util.** com.android.wifi.x.@0
		rule com.android.modules.utils.** com.android.wifi.x.@0

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -21,10 +21,11 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.net.wifi.SoftApConfiguration.BandType;
		import android.net.wifi.util.SdkLevelUtil;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.modules.utils.build.SdkLevel;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Arrays;
		@@ -176,7 +177,7 @@ public final class SoftApCapability implements Parcelable {
		*/
		@NonNull
		public int[] getSupportedChannelList(@BandType int band) {
		if (!SdkLevelUtil.isAtLeastS()) {
		if (!SdkLevel.isAtLeastS()) {
		throw new UnsupportedOperationException();
		}
		switch (band) {

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.net.MacAddress;
		import android.net.wifi.util.SdkLevelUtil;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.text.TextUtils;
		@@ -31,6 +30,7 @@ import android.util.SparseIntArray;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.Preconditions;
		import com.android.modules.utils.build.SdkLevel;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -499,7 +499,7 @@ public final class SoftApConfiguration implements Parcelable {
		*/
		@SystemApi
		public @NonNull int[] getBands() {
		if (!SdkLevelUtil.isAtLeastS()) {
		if (!SdkLevel.isAtLeastS()) {
		throw new UnsupportedOperationException();
		}
		int[] bands = new int[mChannels.size()];
		@@ -535,7 +535,7 @@ public final class SoftApConfiguration implements Parcelable {
		*/
		@SystemApi
		public @NonNull SparseIntArray getChannels() {
		if (!SdkLevelUtil.isAtLeastS()) {
		if (!SdkLevel.isAtLeastS()) {
		throw new UnsupportedOperationException();
		}
		return mChannels;
		@@ -635,7 +635,7 @@ public final class SoftApConfiguration implements Parcelable {
		@SystemApi
		@MacRandomizationSetting
		public int getMacRandomizationSetting() {
		if (!SdkLevelUtil.isAtLeastS()) {
		if (!SdkLevel.isAtLeastS()) {
		throw new UnsupportedOperationException();
		}
		return mMacRandomizationSetting;
		@@ -1219,7 +1219,7 @@ public final class SoftApConfiguration implements Parcelable {
		@NonNull
		public Builder setMacRandomizationSetting(
		@MacRandomizationSetting int macRandomizationSetting) {
		if (!SdkLevelUtil.isAtLeastS()) {
		if (!SdkLevel.isAtLeastS()) {
		throw new UnsupportedOperationException();
		}
		mMacRandomizationSetting = macRandomizationSetting;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,11 +20,11 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.net.MacAddress;
		import android.net.wifi.util.SdkLevelUtil;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.internal.util.Preconditions;
		import com.android.modules.utils.build.SdkLevel;

		import java.util.Objects;

		@@ -141,7 +141,7 @@ public final class SoftApInfo implements Parcelable {
		*/
		@Nullable
		public MacAddress getBssid() {
		if (!SdkLevelUtil.isAtLeastS()) {
		if (!SdkLevel.isAtLeastS()) {
		throw new UnsupportedOperationException();
		}
		return mBssid;
		@@ -180,7 +180,7 @@ public final class SoftApInfo implements Parcelable {
		* @return valid values from {@link ScanResult}'s {@code WIFI_STANDARD_}
		*/
		public @WifiAnnotations.WifiStandard int getWifiStandard() {
		if (!SdkLevelUtil.isAtLeastS()) {
		if (!SdkLevel.isAtLeastS()) {
		throw new UnsupportedOperationException();
		}
		return mWifiStandard;