Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch to WifiManager.{start,stop}SoftAp()"

Browse Source
This commit is contained in:
Treehugger Robot
2017-04-20 15:37:29 +00:00
committed by Gerrit Code Review
parent 4c7a999d79 ceb54c63dc
commit 275edcb940
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -413,7 +413,8 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
mWifiTetherRequested = enable; mWifiTetherRequested = enable;
final WifiManager wifiManager = final WifiManager wifiManager =
(WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); (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_NO_ERROR;
} }
return ConnectivityManager.TETHER_ERROR_MASTER_ERROR; return ConnectivityManager.TETHER_ERROR_MASTER_ERROR;

9
tests/net/java/com/android/server/connectivity/TetheringTest.java
View File

@@ -223,8 +223,6 @@ public class TetheringTest {
@Test @Test
public void workingLocalOnlyHotspot() throws Exception { public void workingLocalOnlyHotspot() throws Exception {
when(mConnectivityManager.isTetheringSupported()).thenReturn(true); when(mConnectivityManager.isTetheringSupported()).thenReturn(true);
when(mWifiManager.setWifiApEnabled(any(WifiConfiguration.class), anyBoolean()))
.thenReturn(true);
// Emulate externally-visible WifiManager effects, causing the // Emulate externally-visible WifiManager effects, causing the
// per-interface state machine to start up, and telling us that // per-interface state machine to start up, and telling us that
@@ -272,13 +270,12 @@ public class TetheringTest {
@Test @Test
public void workingWifiTethering() throws Exception { public void workingWifiTethering() throws Exception {
when(mConnectivityManager.isTetheringSupported()).thenReturn(true); when(mConnectivityManager.isTetheringSupported()).thenReturn(true);
when(mWifiManager.setWifiApEnabled(any(WifiConfiguration.class), anyBoolean())) when(mWifiManager.startSoftAp(any(WifiConfiguration.class))).thenReturn(true);
.thenReturn(true);
// Emulate pressing the WiFi tethering button. // Emulate pressing the WiFi tethering button.
mTethering.startTethering(ConnectivityManager.TETHERING_WIFI, null, false); mTethering.startTethering(ConnectivityManager.TETHERING_WIFI, null, false);
mLooper.dispatchAll(); mLooper.dispatchAll();
verify(mWifiManager, times(1)).setWifiApEnabled(null, true); verify(mWifiManager, times(1)).startSoftAp(null);
verifyNoMoreInteractions(mWifiManager); verifyNoMoreInteractions(mWifiManager);
verifyNoMoreInteractions(mConnectivityManager); verifyNoMoreInteractions(mConnectivityManager);
verifyNoMoreInteractions(mNMService); verifyNoMoreInteractions(mNMService);
@@ -322,7 +319,7 @@ public class TetheringTest {
// Emulate pressing the WiFi tethering button. // Emulate pressing the WiFi tethering button.
mTethering.stopTethering(ConnectivityManager.TETHERING_WIFI); mTethering.stopTethering(ConnectivityManager.TETHERING_WIFI);
mLooper.dispatchAll(); mLooper.dispatchAll();
verify(mWifiManager, times(1)).setWifiApEnabled(null, false); verify(mWifiManager, times(1)).stopSoftAp();
verifyNoMoreInteractions(mWifiManager); verifyNoMoreInteractions(mWifiManager);
verifyNoMoreInteractions(mConnectivityManager); verifyNoMoreInteractions(mConnectivityManager);
verifyNoMoreInteractions(mNMService); verifyNoMoreInteractions(mNMService);