From 1859a19302cd714b5dbcb83e8bbe31dcef30419c Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Wed, 27 Mar 2019 12:49:42 -0700 Subject: [PATCH] Added connect listener to startOsuProvisioning() Updated AccessPoint.startOsuProvisioning() call to accept a connect listener to display a toast on failure to connect. Bug: 123697580 Test: build Change-Id: I0f29b2f5ccc8f2d4b8137639725dca1bcb106b26 --- src/com/android/settings/wifi/WifiSettings.java | 2 +- src/com/android/settings/wifi/slice/ConnectToWifiHandler.java | 2 +- .../android/settings/wifi/slice/ConnectToWifiHandlerTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 91672104e45..8e7b53a8388 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -564,7 +564,7 @@ public class WifiSettings extends RestrictedSettingsFragment */ switch (WifiUtils.getConnectingType(mSelectedAccessPoint)) { case WifiUtils.CONNECT_TYPE_OSU_PROVISION: - mSelectedAccessPoint.startOsuProvisioning(); + mSelectedAccessPoint.startOsuProvisioning(mConnectListener); mClickedConnect = true; break; diff --git a/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java b/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java index 7b21b65a8e0..064037e2e5d 100644 --- a/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java +++ b/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java @@ -48,7 +48,7 @@ public class ConnectToWifiHandler extends Activity { void connect(AccessPoint accessPoint) { switch (WifiUtils.getConnectingType(accessPoint)) { case WifiUtils.CONNECT_TYPE_OSU_PROVISION: - accessPoint.startOsuProvisioning(); + accessPoint.startOsuProvisioning(null /* listener */); break; case WifiUtils.CONNECT_TYPE_OPEN_NETWORK: diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java index a7cf327a245..24b0b380434 100644 --- a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java @@ -78,7 +78,7 @@ public class ConnectToWifiHandlerTest { mHandler.connect(mAccessPoint); - verify(mAccessPoint).startOsuProvisioning(); + verify(mAccessPoint).startOsuProvisioning(null /* listener */); }