diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-09-27 14:58:43 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-09-29 15:45:47 -0700 |
| commit | c33cd23c17c24df33550a6662cedfe60b323604a (patch) | |
| tree | 095c266e9e5a675dee859782ac59e72595f8ffbf /wifi/java/android/net/wifi/p2p | |
| parent | 015bcd4dd43b850ef209c64dae9c08ccaef9ea80 (diff) | |
| download | frameworks_base-c33cd23c17c24df33550a6662cedfe60b323604a.zip frameworks_base-c33cd23c17c24df33550a6662cedfe60b323604a.tar.gz frameworks_base-c33cd23c17c24df33550a6662cedfe60b323604a.tar.bz2 | |
Use a build-specific wifi country code
This ignores any previous setting and instead uses
a value set at build time. This does not preclude
us from using some other signal to determine country
for wifi channel limits.
bug:10513734
Change-Id: Ib82c07285af70fbd82eb0466b7391979ebc8be10
Diffstat (limited to 'wifi/java/android/net/wifi/p2p')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index 625ffb8..50e8e3d 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -2545,12 +2545,6 @@ 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); } |