Merge "[Wi-Fi DPP] Wi-Fi QR code scanner is not working after a connection fail" into qt-dev am: d64b6c8846 am: 9b971efd6b

am: 6d435d69b3

Change-Id: I7aeb116d93e608204541d626b48274ffd8254bb6

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

@@ -664,6 +664,10 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
             return;
         }
 
+        if (mCamera.isDecodeTaskAlive()) {
+            mCamera.stop();
+        }
+
         final SurfaceTexture surfaceTexture = mTextureView.getSurfaceTexture();
         if (surfaceTexture == null) {
             throw new IllegalStateException("SurfaceTexture is not ready for restarting camera");