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

Commit b381ab48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837



Change-Id: Ib085e91a027746460b1d49928e1e40c5ac17d166
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 40299749 f6c0e2d4

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

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

    protected Boolean mIs6gBandSupported;

    protected Boolean mIs6gAvailable;

    protected Boolean mIs6gAvailable;

    protected MutableLiveData<Boolean> m6gAvailable;

    protected MutableLiveData<Boolean> m6gAvailable;

    protected String mCurrentCountryCode;

    protected ActiveCountryCodeChangedCallback mActiveCountryCodeChangedCallback;

    protected ActiveCountryCodeChangedCallback mActiveCountryCodeChangedCallback;





    @VisibleForTesting

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

        @Override

        public void onActiveCountryCodeChanged(String country) {

        public void onActiveCountryCodeChanged(String country) {

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

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

            mCurrentCountryCode = country;

            purgeRefreshData();

            purgeRefreshData();

            refresh();

            refresh();

        }

        }





        @Override

        @Override

        public void onCountryCodeInactive() {

        public void onCountryCodeInactive() {

            log("onCountryCodeInactive()");

            mCurrentCountryCode = null;

            purgeRefreshData();

            refresh();

        }

        }

    }

    }

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

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

public class WifiHotspotRepositoryTest {

    static final String WIFI_SSID = "wifi_ssid";

    static final String WIFI_SSID = "wifi_ssid";

    static final String WIFI_PASSWORD = "wifi_password";

    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_5GHZ_BAND_PREFERRED = BAND_2GHZ_5GHZ;

    static final int WIFI_6GHZ_BAND_PREFERRED = BAND_2GHZ_5GHZ_6GHZ;

    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 = new WifiHotspotRepository(mContext, mWifiManager, mTetheringManager);

        mRepository.mSecurityType = mSecurityType;

        mRepository.mSecurityType = mSecurityType;

        mRepository.mSpeedType = mSpeedType;

        mRepository.mSpeedType = mSpeedType;

        mRepository.mCurrentCountryCode = WIFI_CURRENT_COUNTRY_CODE;

        mRepository.mIsDualBand = true;

        mRepository.mIsDualBand = true;

        mRepository.mIs5gAvailable = true;

        mRepository.mIs5gAvailable = true;

        mRepository.mIs6gAvailable = true;

        mRepository.mIs6gAvailable = true;