diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-03-15 13:39:30 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-03-15 13:39:30 -0700 |
| commit | 9e535b86eed3671ce997aee024ad76038e30f78b (patch) | |
| tree | 19caefa3f486c44c060bddca5d93e544f206ac2e /wifi/java/android/net/wifi/WifiManager.java | |
| parent | 42d0dfebf05c6859a666896ee8607dca2963999b (diff) | |
| parent | b938c0e2036d28df24ec626fc8ed7e277248b9a6 (diff) | |
| download | frameworks_base-9e535b86eed3671ce997aee024ad76038e30f78b.zip frameworks_base-9e535b86eed3671ce997aee024ad76038e30f78b.tar.gz frameworks_base-9e535b86eed3671ce997aee024ad76038e30f78b.tar.bz2 | |
am "Do not provide 5GHz option for softap if there is no country code available"
merged from goog/mirror-m-wireless-internal-release
b938c0e Do not provide 5GHz option for softap if there is no country code available
Diffstat (limited to 'wifi/java/android/net/wifi/WifiManager.java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 24bf115..b292c22 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1260,6 +1260,21 @@ public class WifiManager { } /** + * 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 * {@link #WIFI_FREQUENCY_BAND_AUTO}, |