From 1e8a21f258dda8ea4b8c66edbc4f581a8a7b3fa0 Mon Sep 17 00:00:00 2001 From: Johnson Lu Date: Fri, 18 Jan 2019 07:17:55 +0800 Subject: [PATCH] Update parameter for Easy Connect API in WiFi DPP flow Due to API changes, uses Executor instead of Handler for Easy Connect API. Test: manual test Bug: 122331217 Change-Id: Iddda3e6c9079e2bba814be6a0097d60ee349a504 --- .../android/settings/wifi/dpp/WifiDppAddDeviceFragment.java | 5 +++-- .../android/settings/wifi/dpp/WifiDppEnrolleeActivity.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java index df20caaef75..15e530ee8e8 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java +++ b/src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java @@ -33,6 +33,8 @@ import android.widget.ProgressBar; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; +import java.util.concurrent.Executor; + /** * After getting Wi-Fi network information and(or) QR code, this fragment config a device to connect * to the Wi-Fi network. @@ -148,9 +150,8 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment { final int networkId = ((WifiDppConfiguratorActivity) getActivity()).getWifiNetworkConfig().getNetworkId(); final WifiManager wifiManager = getContext().getSystemService(WifiManager.class); - wifiManager.startEasyConnectAsConfiguratorInitiator(qrCode, networkId, - WifiManager.EASY_CONNECT_NETWORK_ROLE_STA, /* handler */ null, + WifiManager.EASY_CONNECT_NETWORK_ROLE_STA, getContext().getMainExecutor(), new EasyConnectStatusCallback()); } diff --git a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java index 66f75fa742c..9036adc9133 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java +++ b/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java @@ -35,6 +35,7 @@ import com.android.settings.core.InstrumentedActivity; import com.android.settings.R; import java.util.List; +import java.util.concurrent.Executor; /** * To provision "this" device with specified Wi-Fi network. @@ -148,7 +149,7 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements @Override public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) { final WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); - wifiManager.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode(), /* handler */ null, + wifiManager.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode(), getMainExecutor(), new EasyConnectStatusCallback()); }