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

Update parameter for Easy Connect API in WiFi DPP flow

Browse Source 
Due to API changes, uses Executor instead of Handler for Easy Connect
API.

Test: manual test
Bug: 122331217
Change-Id: Iddda3e6c9079e2bba814be6a0097d60ee349a504
This commit is contained in:
Johnson Lu
2019-01-18 07:17:55 +08:00
parent 3eac2faa9c
commit 1e8a21f258
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/dpp/WifiDppAddDeviceFragment.java
View File

@@ -33,6 +33,8 @@ import android.widget.ProgressBar;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R; 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 * After getting Wi-Fi network information and(or) QR code, this fragment config a device to connect
* to the Wi-Fi network. * to the Wi-Fi network.
@@ -148,9 +150,8 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
final int networkId = final int networkId =
((WifiDppConfiguratorActivity) getActivity()).getWifiNetworkConfig().getNetworkId(); ((WifiDppConfiguratorActivity) getActivity()).getWifiNetworkConfig().getNetworkId();
final WifiManager wifiManager = getContext().getSystemService(WifiManager.class); final WifiManager wifiManager = getContext().getSystemService(WifiManager.class);
wifiManager.startEasyConnectAsConfiguratorInitiator(qrCode, networkId, wifiManager.startEasyConnectAsConfiguratorInitiator(qrCode, networkId,
WifiManager.EASY_CONNECT_NETWORK_ROLE_STA, /* handler */ null, WifiManager.EASY_CONNECT_NETWORK_ROLE_STA, getContext().getMainExecutor(),
new EasyConnectStatusCallback()); new EasyConnectStatusCallback());
} }

3
src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivity.java
View File

@@ -35,6 +35,7 @@ import com.android.settings.core.InstrumentedActivity;
import com.android.settings.R; import com.android.settings.R;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor;
/** /**
* To provision "this" device with specified Wi-Fi network. * To provision "this" device with specified Wi-Fi network.
@@ -148,7 +149,7 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
@Override @Override
public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) { public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {
final WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); final WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
wifiManager.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode(), /* handler */ null, wifiManager.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode(), getMainExecutor(),
new EasyConnectStatusCallback()); new EasyConnectStatusCallback());
} }