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

Commit 2ed3ff11 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb9 am:... 

Merge "Merge "Switch to WifiManager.{start,stop}SoftAp()" am: 275edcb9 am: 11fdd176 am: 7d321645" into oc-dev-plus-aosp
parents 18d539cd dc7e445b

services/core/java/com/android/server/connectivity/Tethering.java

+2 −1
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering 
            mWifiTetherRequested = enable;

            final WifiManager wifiManager =

                    (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);

            if (wifiManager.setWifiApEnabled(null /* use existing wifi config */, enable)) {

            if ((enable && wifiManager.startSoftAp(null /* use existing wifi config */)) ||

                (!enable && wifiManager.stopSoftAp())) {

                return ConnectivityManager.TETHER_ERROR_NO_ERROR;

            }

            return ConnectivityManager.TETHER_ERROR_MASTER_ERROR;

tests/net/java/com/android/server/connectivity/TetheringTest.java

+3 −6
Original line number Diff line number Diff line
@@ -223,8 +223,6 @@ public class TetheringTest { 
    @Test

    public void workingLocalOnlyHotspot() throws Exception {

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

        when(mWifiManager.setWifiApEnabled(any(WifiConfiguration.class), anyBoolean()))

                .thenReturn(true);



        // Emulate externally-visible WifiManager effects, causing the

        // per-interface state machine to start up, and telling us that
@@ -272,13 +270,12 @@ public class TetheringTest { 
    @Test

    public void workingWifiTethering() throws Exception {

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

        when(mWifiManager.setWifiApEnabled(any(WifiConfiguration.class), anyBoolean()))

                .thenReturn(true);

        when(mWifiManager.startSoftAp(any(WifiConfiguration.class))).thenReturn(true);



        // Emulate pressing the WiFi tethering button.

        mTethering.startTethering(ConnectivityManager.TETHERING_WIFI, null, false);

        mLooper.dispatchAll();

        verify(mWifiManager, times(1)).setWifiApEnabled(null, true);

        verify(mWifiManager, times(1)).startSoftAp(null);

        verifyNoMoreInteractions(mWifiManager);

        verifyNoMoreInteractions(mConnectivityManager);

        verifyNoMoreInteractions(mNMService);
@@ -322,7 +319,7 @@ public class TetheringTest { 
        // Emulate pressing the WiFi tethering button.

        mTethering.stopTethering(ConnectivityManager.TETHERING_WIFI);

        mLooper.dispatchAll();

        verify(mWifiManager, times(1)).setWifiApEnabled(null, false);

        verify(mWifiManager, times(1)).stopSoftAp();

        verifyNoMoreInteractions(mWifiManager);

        verifyNoMoreInteractions(mConnectivityManager);

        verifyNoMoreInteractions(mNMService);