diff options
| author | Camera Software Integration <camswint@localhost> | 2016-11-15 07:03:45 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-15 07:03:45 -0800 |
| commit | 7c31b1e54e8fb6cd28e24eaee1e1d700d2061435 (patch) | |
| tree | 374b844da42a1954db74703e8023ce4bf01492aa /src | |
| parent | bfc0b3ffcae4762570273e6d46fdb4ca9bbcca60 (diff) | |
| parent | 484135bc1c12974f1d8331867213849a6c36948b (diff) | |
| download | android_packages_apps_Snap-7c31b1e54e8fb6cd28e24eaee1e1d700d2061435.tar.gz android_packages_apps_Snap-7c31b1e54e8fb6cd28e24eaee1e1d700d2061435.tar.bz2 android_packages_apps_Snap-7c31b1e54e8fb6cd28e24eaee1e1d700d2061435.zip | |
Merge "SnapdragonCamera:Fix crash when failed to set param" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/AndroidCameraManagerImpl.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index 62a0854d9..486629895 100644..100755 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -383,6 +383,12 @@ class AndroidCameraManagerImpl implements CameraManager { } } catch (RuntimeException e) { if (msg.what != RELEASE && mCamera != null) { + if (msg.what == SET_PARAMETERS) { + mParametersIsDirty = false; + Log.e(TAG,"Fail to set parameters"); + mSig.open(); + return; + } try { mCamera.release(); } catch (Exception ex) { |