PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Wi-Fi connect listener in ConnectToWifiHandler

Browse Source 
- Extract the connect listener from WifiSettings
- Add a listener to display a toast on failure to connect in ConnectToWifiHandler
- Also for the new AccessPoint.startOsuProvisioning() which accepts a connect listener

Bug: 123697580
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I29b2c1e2c58312d692675ecabf2818b4bbed3b51
This commit is contained in:
Jason Chiu
2019-03-28 15:56:21 +08:00
parent 95ba1ab61f
commit 1b5f5ef510
4 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
View File

@@ -22,6 +22,7 @@ import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
import com.android.settings.wifi.WifiConnectListener;
import com.android.settings.wifi.WifiDialogActivity;
import com.android.settings.wifi.WifiUtils;
import com.android.settingslib.wifi.AccessPoint;
@@ -46,9 +47,10 @@ public class ConnectToWifiHandler extends Activity {
@VisibleForTesting
void connect(AccessPoint accessPoint) {
final WifiConnectListener connectListener = new WifiConnectListener(this);
switch (WifiUtils.getConnectingType(accessPoint)) {
case WifiUtils.CONNECT_TYPE_OSU_PROVISION:
accessPoint.startOsuProvisioning(null /* listener */);
accessPoint.startOsuProvisioning(connectListener);
break;
case WifiUtils.CONNECT_TYPE_OPEN_NETWORK:
@@ -56,7 +58,7 @@ public class ConnectToWifiHandler extends Activity {
case WifiUtils.CONNECT_TYPE_SAVED_NETWORK:
final WifiManager wifiManager = getSystemService(WifiManager.class);
wifiManager.connect(accessPoint.getConfig(), null /* listener */);
wifiManager.connect(accessPoint.getConfig(), connectListener);
break;
}
}