diff options
| author | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2014-12-30 20:35:26 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-04 20:21:24 -0800 |
| commit | a3916a4a07fe47281567ac54e94ecb079051cee8 (patch) | |
| tree | e375be091523aff1b1b9bcea7cfdd5f8cebdfd52 /src/com | |
| parent | d5bb29f7b1f4107f0128ae5949dad2093e264564 (diff) | |
| download | android_packages_apps_Snap-a3916a4a07fe47281567ac54e94ecb079051cee8.tar.gz android_packages_apps_Snap-a3916a4a07fe47281567ac54e94ecb079051cee8.tar.bz2 android_packages_apps_Snap-a3916a4a07fe47281567ac54e94ecb079051cee8.zip | |
SnapdragonCamera: Fix camera double open issue.
If switch camera occurs before open camera thread completes, it
will result in camera double open exception. Hence wait for open
thread and then do switch.
Change-Id: Id12f149a2b850dc7cf1c872cec016c95e604f713
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 32cd5dcf7..5d556b2fe 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -655,6 +655,14 @@ public class PhotoModule setCameraId(mCameraId); // from onPause + try { + if (mOpenCameraThread != null) { + mOpenCameraThread.join(); + mOpenCameraThread = null; + } + } catch (InterruptedException ex) { + // ignore + } closeCamera(); mUI.collapseCameraControls(); mUI.clearFaces(); |