Merge "[DPP] Fix usage of "DPP" public API to "Easy Connect"" (8466751a) · Commits · e / os / android_packages_apps_Settings

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
		private Button mButtonLeft;
		private Button mButtonRight;

		private class DppStatusCallback extends android.net.wifi.DppStatusCallback {
		private class EasyConnectStatusCallback extends android.net.wifi.EasyConnectStatusCallback {
		@Override
		public void onEnrolleeSuccess(int newNetworkId) {
		// Do nothing
		@@ -65,7 +65,7 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {

		@Override
		public void onFailure(int code) {
		Log.d(TAG, "DppStatusCallback.onFailure " + code);
		Log.d(TAG, "EasyConnectStatusCallback.onFailure " + code);

		// Update fail UI.
		mTitle.setText(R.string.wifi_dpp_could_not_add_device);
		@@ -149,8 +149,9 @@ public class WifiDppAddDeviceFragment extends WifiDppQrCodeBaseFragment {
		((WifiDppConfiguratorActivity) getActivity()).getWifiNetworkConfig().getNetworkId();
		final WifiManager wifiManager = getContext().getSystemService(WifiManager.class);

		wifiManager.startDppAsConfiguratorInitiator(qrCode, networkId,
		WifiManager.DPP_NETWORK_ROLE_STA, /* handler */ null, new DppStatusCallback());
		wifiManager.startEasyConnectAsConfiguratorInitiator(qrCode, networkId,
		WifiManager.EASY_CONNECT_NETWORK_ROLE_STA, /* handler */ null,
		new EasyConnectStatusCallback());
		}

		// Container Activity must implement this interface

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -53,12 +53,13 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements

		private FragmentManager mFragmentManager;

		private class DppStatusCallback extends android.net.wifi.DppStatusCallback {
		private class EasyConnectStatusCallback extends android.net.wifi.EasyConnectStatusCallback {
		@Override
		public void onEnrolleeSuccess(int newNetworkId) {
		// Connect to the new network.
		final WifiManager wifiManager = getSystemService(WifiManager.class);
		final List<WifiConfiguration> wifiConfigs = wifiManager.getPrivilegedConfiguredNetworks();
		final List<WifiConfiguration> wifiConfigs =
		wifiManager.getPrivilegedConfiguredNetworks();
		for (WifiConfiguration wifiConfig : wifiConfigs) {
		if (wifiConfig.networkId == newNetworkId) {
		wifiManager.connect(wifiConfig, WifiDppEnrolleeActivity.this);
		@@ -77,7 +78,7 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
		@Override
		public void onFailure(int code) {
		//TODO(b/122429170): Show DPP enrollee error state UI
		Log.d(TAG, "DppStatusCallback.onFailure " + code);
		Log.d(TAG, "EasyConnectStatusCallback.onFailure " + code);
		}

		@Override
		@@ -147,8 +148,8 @@ public class WifiDppEnrolleeActivity extends InstrumentedActivity implements
		@Override
		public void onScanWifiDppSuccess(WifiQrCode wifiQrCode) {
		final WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
		wifiManager.startDppAsEnrolleeInitiator(wifiQrCode.getQrCode(), /* handler */ null,
		new DppStatusCallback());
		wifiManager.startEasyConnectAsEnrolleeInitiator(wifiQrCode.getQrCode(), /* handler */ null,
		new EasyConnectStatusCallback());
		}

		@Override