diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-07 01:32:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-07 01:32:39 -0800 |
| commit | 388711f46e88f2dc69eb7b0f334511b4f80b337b (patch) | |
| tree | c82c2c9653b977cc316078a76baeee80e4ab2de5 /src/com | |
| parent | e22208b001bbdeabc60565438eb2bcac3a67e00b (diff) | |
| parent | a3916a4a07fe47281567ac54e94ecb079051cee8 (diff) | |
| download | android_packages_apps_Snap-388711f46e88f2dc69eb7b0f334511b4f80b337b.tar.gz android_packages_apps_Snap-388711f46e88f2dc69eb7b0f334511b4f80b337b.tar.bz2 android_packages_apps_Snap-388711f46e88f2dc69eb7b0f334511b4f80b337b.zip | |
Merge "SnapdragonCamera: Fix camera double open issue."
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 b0ad0ae20..07be47f3a 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(); |