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

Commit 592faf36 authored by Lei Yu's avatar Lei Yu
Browse files

Update the toggle state in constructor. 

Before this cl, the update of toggle depends on BroadcastReceiver.
However it is not called when toggle is inited, which make the toggle in
broken state sometimes.

This cl make it execute the update method in constructor, so toggle can
get the correct state when it is created.

Fixes: 73718975
Test: RunSettingsRoboTests
Change-Id: Icb798afaff0bdeedad3a966315441712be2e2523
parent 048b71a6

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS 
        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

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

        mSwitchBar.setChecked(mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED);

        mSwitchBar.setChecked(mWifiManager.getWifiApState() == WifiManager.WIFI_AP_STATE_ENABLED);

        mSwitchBar.setListener(this);

        mSwitchBar.setListener(this);

        updateWifiSwitch();

    }

    }





    @Override

    @Override
@@ -103,7 +104,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS 
                        WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED);

                        WifiManager.EXTRA_WIFI_AP_STATE, WifiManager.WIFI_AP_STATE_FAILED);

                handleWifiApStateChanged(state);

                handleWifiApStateChanged(state);

            } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {

            } else if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(action)) {

                enableWifiSwitch();

                updateWifiSwitch();

            }

            }

        }

        }

    };

    };
@@ -117,7 +118,7 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS 
                if (!mSwitchBar.isChecked()) {

                if (!mSwitchBar.isChecked()) {

                    mSwitchBar.setChecked(true);

                    mSwitchBar.setChecked(true);

                }

                }

                enableWifiSwitch();

                updateWifiSwitch();

                break;

                break;

            case WifiManager.WIFI_AP_STATE_DISABLING:

            case WifiManager.WIFI_AP_STATE_DISABLING:

                if (mSwitchBar.isChecked()) {

                if (mSwitchBar.isChecked()) {
@@ -127,16 +128,16 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS 
                break;

                break;

            case WifiManager.WIFI_AP_STATE_DISABLED:

            case WifiManager.WIFI_AP_STATE_DISABLED:

                mSwitchBar.setChecked(false);

                mSwitchBar.setChecked(false);

                enableWifiSwitch();

                updateWifiSwitch();

                break;

                break;

            default:

            default:

                mSwitchBar.setChecked(false);

                mSwitchBar.setChecked(false);

                enableWifiSwitch();

                updateWifiSwitch();

                break;

                break;

        }

        }

    }

    }





    private void enableWifiSwitch() {

    private void updateWifiSwitch() {

        boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),

        boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;

                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;

        if (!isAirplaneMode) {

        if (!isAirplaneMode) {

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

0 → 100644
+66 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.wifi.tether;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.net.wifi.WifiManager;

import android.provider.Settings;



import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.widget.SwitchBar;

import com.android.settings.widget.SwitchBarController;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;



@RunWith(SettingsRobolectricTestRunner.class)

public class WifiTetherSwitchBarControllerTest {

    @Mock

    private WifiManager mWifiManager;



    private Context mContext;

    private SwitchBar mSwitchBar;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mContext = spy(RuntimeEnvironment.application);

        mSwitchBar = new SwitchBar(mContext);

        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);

    }



    @Test

    public void testConstructor_airplaneModeOn_switchBarDisabled() {

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.AIRPLANE_MODE_ON, 1);



        final WifiTetherSwitchBarController controller = new WifiTetherSwitchBarController(

                mContext, new SwitchBarController(mSwitchBar));



        assertThat(mSwitchBar.isEnabled()).isFalse();

    }

}