| Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame^] | 1 | From d4c7fb7f3d8193ea8680942169f396e93ccd71bf Mon Sep 17 00:00:00 2001 |
| Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 2 | From: Pierre-Hugues Husson <phh@phh.me> |
| 3 | Date: Mon, 20 Aug 2018 22:39:39 +0200 |
| 4 | Subject: [PATCH 2/2] Allow LocaleTracker to work even if wifi is not up (FDE) |
| 5 | |
| 6 | Change-Id: Ie6a83af047bfcefb2588a9f6e31ac64e76c070a8 |
| 7 | --- |
| 8 | src/java/com/android/internal/telephony/LocaleTracker.java | 4 ++-- |
| 9 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 10 | |
| 11 | diff --git a/src/java/com/android/internal/telephony/LocaleTracker.java b/src/java/com/android/internal/telephony/LocaleTracker.java |
| Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame^] | 12 | index 996e288dc..263d7e572 100644 |
| Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 13 | --- a/src/java/com/android/internal/telephony/LocaleTracker.java |
| 14 | +++ b/src/java/com/android/internal/telephony/LocaleTracker.java |
| 15 | @@ -408,8 +408,8 @@ public class LocaleTracker extends Handler { |
| 16 | // Set the country code for wifi. This sets allowed wifi channels based on the |
| 17 | // country of the carrier we see. If we can't see any, reset to 0 so we don't |
| 18 | // broadcast on forbidden channels. |
| 19 | - ((WifiManager) mPhone.getContext().getSystemService(Context.WIFI_SERVICE)) |
| 20 | - .setCountryCode(countryIso); |
| 21 | + WifiManager wifi = (WifiManager)mPhone.getContext().getSystemService(Context.WIFI_SERVICE); |
| 22 | + if(wifi != null) wifi.setCountryCode(countryIso); |
| 23 | } |
| 24 | } |
| 25 | |
| 26 | -- |
| Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame^] | 27 | 2.17.1 |
| Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 28 | |