Fix WiFi toggle issue of Internet Settings

- Because b/209906859 needs to add WiFi service check for WiFi-less
pixel project.

- But mWifiManager has not been initialized before the
addWifiSwitchPreferenceController() function, which will cause the
controller to not handle the WiFi switching UI.

- Add a hasWifiManager() function to initialize the WiFi manager and
handle related functions.

Bug: 212211915
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Idc0d4cdc31403f0ab9a4eb787e4c70be605f7ddb
This commit is contained in:
Weng Su
2021-12-28 21:24:46 +08:00
parent 8551b0d7c5
commit 0219dc1378
2 changed files with 23 additions and 16 deletions

View File

@@ -45,7 +45,6 @@ import android.os.Bundle;
import android.os.PowerManager;
import android.os.UserManager;
import android.provider.Settings;
import android.util.FeatureFlagUtils;
import android.view.ContextMenu;
import android.view.Menu;
import android.view.MenuItem;
@@ -162,15 +161,14 @@ public class NetworkProviderSettingsTest {
@Test
public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() {
final NetworkProviderSettings NetworkProviderSettings = spy(new NetworkProviderSettings());
final Intent intent = new Intent();
doNothing().when(NetworkProviderSettings).handleAddNetworkRequest(anyInt(),
doNothing().when(mNetworkProviderSettings).handleAddNetworkRequest(anyInt(),
any(Intent.class));
NetworkProviderSettings.onActivityResult(NetworkProviderSettings.ADD_NETWORK_REQUEST,
mNetworkProviderSettings.onActivityResult(NetworkProviderSettings.ADD_NETWORK_REQUEST,
Activity.RESULT_OK, intent);
verify(NetworkProviderSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
verify(mNetworkProviderSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
}
@Test