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

Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev

Browse Source
This commit is contained in:
xinhe
2015-02-25 23:34:39 +00:00
committed by Android Partner Code Review
parent c4423a5f0a b938c0e203
commit a357b5adf0
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/java/android/net/wifi/IWifiManager.aidl
View File

@@ -79,6 +79,8 @@ interface IWifiManager
void setCountryCode(String country, boolean persist); void setCountryCode(String country, boolean persist);
String getCountryCode();
void setFrequencyBand(int band, boolean persist); void setFrequencyBand(int band, boolean persist);
int getFrequencyBand(); int getFrequencyBand();

15
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -1237,6 +1237,21 @@ public class WifiManager {
} catch (RemoteException e) { } } 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. * Set the operational frequency band.
* @param band One of * @param band One of