Merge "Wifi: Add definitions for 6GHz" into rvc-dev (7ccfc086) · Commits · e / os / android_frameworks_base

core/proto/android/server/connectivity/data_stall_event.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ enum ApBand {
		AP_BAND_UNKNOWN = 0;
		AP_BAND_2GHZ = 1;
		AP_BAND_5GHZ = 2;
		AP_BAND_6GHZ = 3;
		}

		// Refer to definition in TelephonyManager.java.

+7 −2

Original line number	Diff line number	Diff line
		@@ -632,7 +632,6 @@ public class WifiInfo implements Parcelable {

		/**
		* @hide
		* TODO: makes real freq boundaries
		*/
		public boolean is24GHz() {
		return ScanResult.is24GHz(mFrequency);
		@@ -640,13 +639,19 @@ public class WifiInfo implements Parcelable {

		/**
		* @hide
		* TODO: makes real freq boundaries
		*/
		@UnsupportedAppUsage
		public boolean is5GHz() {
		return ScanResult.is5GHz(mFrequency);
		}

		/**
		* @hide
		*/
		public boolean is6GHz() {
		return ScanResult.is6GHz(mFrequency);
		}

		/**
		* Record the MAC address of the WLAN interface
		* @param macAddress the MAC address in {@code XX:XX:XX:XX:XX:XX} form