Merge "Crash when scanning WiFi QR code" am: 6c31283455 (7950a0ac) · Commits · e / os / android_packages_apps_Settings

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -168,10 +168,18 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
		break;

		case MESSAGE_SCAN_ZXING_WIFI_FORMAT_SUCCESS:
		final Context context = getContext();
		if (context == null) {
		// Context may be null if the message is received after the Activity has
		// been destroyed
		Log.d(TAG, "Scan success but context is null");
		return;
		}

		// We may get 2 WifiConfiguration if the QR code has no password in it,
		// one for open network and one for enhanced open network.
		final WifiManager wifiManager =
		getContext().getSystemService(WifiManager.class);
		context.getSystemService(WifiManager.class);
		final WifiNetworkConfig qrCodeWifiNetworkConfig =
		(WifiNetworkConfig)msg.obj;
		final List<WifiConfiguration> qrCodeWifiConfigurations =

+1 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ public class QrCamera extends Handler {
		}
		if (mCamera != null) {
		mCamera.stopPreview();
		releaseCamera();
		}
		}