Merge "Do not provide 5GHz option for softap if there is no country code... (a357b5ad) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/IWifiManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,8 @@ interface IWifiManager

		void setCountryCode(String country, boolean persist);

		String getCountryCode();

		void setFrequencyBand(int band, boolean persist);

		int getFrequencyBand();

+15 −0

Original line number	Diff line number	Diff line
		@@ -1237,6 +1237,21 @@ public class WifiManager {
		} catch (RemoteException e) { }
		}

		/**
		* get the country code.
		* @return the country code in ISO 3166 format.
		*
		* @hide
		*/
		public String getCountryCode() {
		try {
		String country = mService.getCountryCode();
		return(country);
		} catch (RemoteException e) {
		return null;
		}
		}

		/**
		* Set the operational frequency band.
		* @param band One of