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

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

Browse Source 
am: 6d435d69b3

Change-Id: I7aeb116d93e608204541d626b48274ffd8254bb6
This commit is contained in:
Arc Wang
2019-06-19 21:34:36 -07:00
committed by android-build-merger
parent 2ee1249b01 6d435d69b3
commit 781a61930c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

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