commit b31c62c877f387b71504821bec36200b9d6449c9
author Ningyuan Wang <nywang@google.com> Wed Sep 21 10:14:06 2016 -0700
committer Ningyuan Wang <nywang@google.com> Wed Sep 21 10:14:06 2016 -0700
tree b37cfacda5a7a0b1a14db37fd0e9693455078b87
parent 9223af8ad04a6a68dec4eaee338fee23cb86e2db

Mcc should not set country code with persistent request

A false persistent parameter ensures that wifi country code
will fall back to phone default country code upon SIM card removing.

Bug:31640617
Change-Id: Ie55fea196f314d0f8d7af8d9c68c04e14dd28987
Test: compile

src/java/com/android/internal/telephony/MccTable.java

diff --git a/src/java/com/android/internal/telephony/MccTable.java b/src/java/com/android/internal/telephony/MccTable.java
index 1797e65..0ee153c 100644
--- a/src/java/com/android/internal/telephony/MccTable.java
+++ b/src/java/com/android/internal/telephony/MccTable.java
@@ -387,8 +387,7 @@
         String country = MccTable.countryCodeForMcc(mcc);
         Slog.d(LOG_TAG, "WIFI_COUNTRY_CODE set to " + country);
         WifiManager wM = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        //persist
-        wM.setCountryCode(country, true);
+        wM.setCountryCode(country, false);
     }
 
     static {