Fix NPE when tapping on Add Network in Settings > WiFi (6221467f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiSettings.java

+26 −23

Original line number	Diff line number	Diff line
		@@ -508,6 +508,7 @@ public class WifiSettings extends RestrictedSettingsFragment
		}

		private void showDialog(AccessPoint accessPoint, boolean edit) {
		if (accessPoint != null) {
		WifiConfiguration config = accessPoint.getConfig();
		if (isCreatorDeviceOwner(getActivity(), config) && accessPoint.isActive()) {
		final int userId = UserHandle.getUserId(config.creatorUid);
		@@ -532,6 +533,7 @@ public class WifiSettings extends RestrictedSettingsFragment
		.show();
		return;
		}
		}

		if (mDialog != null) {
		removeDialog(WIFI_DIALOG_ID);
		@@ -561,10 +563,11 @@ public class WifiSettings extends RestrictedSettingsFragment
		}
		// If it's null, fine, it's for Add Network
		mSelectedAccessPoint = ap;
		final boolean hideForget = (ap == null \|\| isCreatorDeviceOwner(getActivity(),
		ap.getConfig()));
		mDialog = new WifiDialog(getActivity(), this, ap, mDlgEdit,
		/* no hide submit/connect */ false,
		/* hide forget if config locked down */ isCreatorDeviceOwner(getActivity(),
		ap.getConfig()));
		/* hide forget if config locked down */ hideForget);
		return mDialog;
		case WPS_PBC_DIALOG_ID:
		return new WpsDialog(getActivity(), WpsInfo.PBC);