diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-03 21:13:49 +0000 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-10-03 21:15:54 +0000 |
| commit | 3ea0c99b67407bb1612875762b037e50f013fd6d (patch) | |
| tree | 4a91dc5164f18dea15c935bc3e785d02a3c999c1 /wifi/java/android/net/wifi/p2p | |
| parent | c33cd23c17c24df33550a6662cedfe60b323604a (diff) | |
| download | frameworks_base-3ea0c99b67407bb1612875762b037e50f013fd6d.zip frameworks_base-3ea0c99b67407bb1612875762b037e50f013fd6d.tar.gz frameworks_base-3ea0c99b67407bb1612875762b037e50f013fd6d.tar.bz2 | |
Revert "Use a build-specific wifi country code"
This reverts commit c33cd23c17c24df33550a6662cedfe60b323604a.
bug:11064682
Change-Id: I35825a7005e75f3abf02f23f31dee1cb7b101c31
Diffstat (limited to 'wifi/java/android/net/wifi/p2p')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index 50e8e3d..625ffb8 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -2545,6 +2545,12 @@ public class WifiP2pService extends IWifiP2pManager.Stub { mServiceTransactionId = 0; mServiceDiscReqId = null; + String countryCode = Settings.Global.getString(mContext.getContentResolver(), + Settings.Global.WIFI_COUNTRY_CODE); + if (countryCode != null && !countryCode.isEmpty()) { + mP2pStateMachine.sendMessage(SET_COUNTRY_CODE, countryCode); + } + updatePersistentNetworks(RELOAD); } |