Merge "Update parameter for Easy Connect API in WiFi DPP flow"

src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java

@@ -32,6 +32,8 @@ import android.widget.ImageView;
 
 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.
@@ -147,9 +149,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());
     }
 

src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java

@@ -35,6 +35,7 @@ import com.android.settings.R;
 import com.android.settings.core.InstrumentedActivity;
 
 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());
     }