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

Commit f6c0e2d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid hotspot band updates when country code is inactive" into udc-dev

parents a0c24932 8b7e0d7c

src/com/android/settings/wifi/repository/WifiHotspotRepository.java

+0 −6
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ public class WifiHotspotRepository { 
    protected Boolean mIs6gBandSupported;

    protected Boolean mIs6gAvailable;

    protected MutableLiveData<Boolean> m6gAvailable;

    protected String mCurrentCountryCode;

    protected ActiveCountryCodeChangedCallback mActiveCountryCodeChangedCallback;



    @VisibleForTesting
@@ -568,17 +567,12 @@ public class WifiHotspotRepository { 
        @Override

        public void onActiveCountryCodeChanged(String country) {

            log("onActiveCountryCodeChanged(), country:" + country);

            mCurrentCountryCode = country;

            purgeRefreshData();

            refresh();

        }



        @Override

        public void onCountryCodeInactive() {

            log("onCountryCodeInactive()");

            mCurrentCountryCode = null;

            purgeRefreshData();

            refresh();

        }

    }

tests/unit/src/com/android/settings/wifi/repository/WifiHotspotRepositoryTest.java

+0 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ import java.util.List; 
public class WifiHotspotRepositoryTest {

    static final String WIFI_SSID = "wifi_ssid";

    static final String WIFI_PASSWORD = "wifi_password";

    static final String WIFI_CURRENT_COUNTRY_CODE = "US";



    static final int WIFI_5GHZ_BAND_PREFERRED = BAND_2GHZ_5GHZ;

    static final int WIFI_6GHZ_BAND_PREFERRED = BAND_2GHZ_5GHZ_6GHZ;
@@ -112,7 +111,6 @@ public class WifiHotspotRepositoryTest { 
        mRepository = new WifiHotspotRepository(mContext, mWifiManager, mTetheringManager);

        mRepository.mSecurityType = mSecurityType;

        mRepository.mSpeedType = mSpeedType;

        mRepository.mCurrentCountryCode = WIFI_CURRENT_COUNTRY_CODE;

        mRepository.mIsDualBand = true;

        mRepository.mIs5gAvailable = true;

        mRepository.mIs6gAvailable = true;