Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d04d02f authored by Ningyuan Wang's avatar Ningyuan Wang Committed by Android (Google) Code Review
Browse files

Merge "telephony: Remove persist argument for setting wifi country code"

parents 47a412bd f256dac7

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

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ public final class MccTable { 
        String country = MccTable.countryCodeForMcc(mcc);

        Slog.d(LOG_TAG, "WIFI_COUNTRY_CODE set to " + country);

        WifiManager wM = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

        wM.setCountryCode(country, false);

        wM.setCountryCode(country);

    }



    static {

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

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
                // note this is not persisting

                WifiManager wM = (WifiManager)

                        mContext.getSystemService(Context.WIFI_SERVICE);

                wM.setCountryCode(country, false);

                wM.setCountryCode(country);

            }

        }