Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e8a21f2 authored by Johnson Lu's avatar Johnson Lu
Browse files

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
parent 3eac2faa

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

+3 −2
Original line number Diff line number Diff line
@@ -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());

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -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());

    }