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

Commit e3db9d80 authored by Antony Sargent's avatar Antony Sargent Committed by android-build-team Robot
Browse files

Bring back "Turning on hotspot" status text when starting hotspot 

We accidentally regressed showing this text when starting the hotspot in
the refactor ag/2381595.

Bug: 64811203
Test: make RunSettingsRoboTests
(cherry picked from commit 5a4b6b15)

Change-Id: I707574b8af99a75ee385b5d968047fc27cbbada0
parent 6670a478

src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController 
    private void handleWifiApStateChanged(int state, int reason) {

        switch (state) {

            case WifiManager.WIFI_AP_STATE_ENABLING:

                mPreference.setSummary(R.string.wifi_tether_starting);

                break;

            case WifiManager.WIFI_AP_STATE_ENABLED:

                /**

                 * Summary on enable is handled by tether

tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java

+14 −5
Original line number Diff line number Diff line
@@ -175,20 +175,29 @@ public class WifiTetherPreferenceControllerTest { 
    }



    @Test

    public void testReceiver_apStateChangedToEnablingOrEnabled_shouldNotUpdatePreferenceSummary() {

    public void testReceiver_apStateChangedToEnabling_shouldUpdatePreferenceSummary() {

        mController.displayPreference(mScreen);

        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLING);

        assertThat(mPreference.getSummary().toString()).isEqualTo(

                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));

    }



    @Test

    public void testReceiver_apStateChangedToEnabled_shouldNotUpdatePreferenceSummary() {

        mController.displayPreference(mScreen);

        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_DISABLED);

        assertThat(mPreference.getSummary().toString()).isEqualTo(

                RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));



        // When turning on the hotspot, we receive STATE_ENABLING followed by STATE_ENABLED. Neither

        // of these should change the summary.

        // When turning on the hotspot, we receive STATE_ENABLING followed by STATE_ENABLED. The

        // first should change the status to wifi_tether_starting, and the second should not change

        // this.

        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLING);

        assertThat(mPreference.getSummary().toString()).isEqualTo(

                RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));

                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));

        receiveApStateChangedBroadcast(WifiManager.WIFI_AP_STATE_ENABLED);

        assertThat(mPreference.getSummary().toString()).isEqualTo(

                RuntimeEnvironment.application.getString(R.string.wifi_hotspot_off_subtext));

                RuntimeEnvironment.application.getString(R.string.wifi_tether_starting));

    }



    @Test