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

Commit 5ca4e06d authored by jackqdyulei's avatar jackqdyulei
Browse files

Add lost prefController to WifiTetherSettings 

One controller is lost during a refactor(ag/4774003), this CL adds
it back.

Change-Id: Ie50a3ac009f302d4fd7a179117fe026031cc1ae8
Fixes: 122235175
Test: RunSettingsRoboTests
parent b940fc3d

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

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
        controllers.add(new WifiTetherSecurityPreferenceController(context, listener));

        controllers.add(new WifiTetherPasswordPreferenceController(context, listener));

        controllers.add(new WifiTetherApBandPreferenceController(context, listener));

        controllers.add(

                new WifiTetherAutoOffPreferenceController(context, KEY_WIFI_TETHER_AUTO_OFF));



        return controllers;

    }

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

+15 −3
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.widget.TextView;



import androidx.fragment.app.FragmentActivity;

import androidx.preference.PreferenceScreen;



import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowWifiManager;
@@ -51,15 +54,13 @@ import org.robolectric.util.ReflectionHelpers; 
import java.util.ArrayList;

import java.util.List;



import androidx.fragment.app.FragmentActivity;

import androidx.preference.PreferenceScreen;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowWifiManager.class})

public class WifiTetherSettingsTest {

    private static final String[] WIFI_REGEXS = {"wifi_regexs"};



    private Context mContext;

    private WifiTetherSettings mWifiTetherSettings;



    @Mock

    private ConnectivityManager mConnectivityManager;
@@ -75,6 +76,8 @@ public class WifiTetherSettingsTest { 
                .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);

        doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs();

        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);



        mWifiTetherSettings = new WifiTetherSettings();

    }



    @Test
@@ -136,6 +139,15 @@ public class WifiTetherSettingsTest { 
        verify(screen).removeAll();

    }



    @Test

    public void createPreferenceControllers_hasAutoOffPreference() {

        assertThat(mWifiTetherSettings.createPreferenceControllers(mContext)

                .stream()

                .filter(controller -> controller instanceof WifiTetherAutoOffPreferenceController)

                .count())

                .isEqualTo(1);

    }



    private void setupIsTetherAvailable(boolean returnValue) {

        when(mConnectivityManager.isTetheringSupported()).thenReturn(true);