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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-19 04:33:21 +00:00
committed by Android (Google) Code Review
parent 5e087b46e2 1e8a21f258
commit abd732a308
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

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