diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-26 09:36:06 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-26 09:36:06 -0800 |
| commit | 8540780a2f781d63b8323461fe7d9babc8a97b1d (patch) | |
| tree | c535a971aecf4540c1f769721917741225d2e079 /src/com/android | |
| parent | cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17 (diff) | |
| parent | a5d8e57b75324f0b08a7853bef5a09d68143d0f5 (diff) | |
| download | android_packages_apps_Snap-8540780a2f781d63b8323461fe7d9babc8a97b1d.tar.gz android_packages_apps_Snap-8540780a2f781d63b8323461fe7d9babc8a97b1d.tar.bz2 android_packages_apps_Snap-8540780a2f781d63b8323461fe7d9babc8a97b1d.zip | |
Merge "SnapdragonCamera: Sync surface destruction and camera open thread."
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoUI.java | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 843d860f7..eb9f31b4d 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -633,6 +633,14 @@ public class PhotoModule if (mCameraDevice == null) { return; } + try { + if (mOpenCameraThread != null) { + mOpenCameraThread.join(); + mOpenCameraThread = null; + } + } catch (InterruptedException ex) { + // ignore + } mCameraDevice.setPreviewDisplay(null); stopPreview(); } diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index d4cec7bc0..f6ddd94ff 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -475,7 +475,7 @@ public class PhotoUI implements PieListener, public void surfaceDestroyed(SurfaceHolder holder) { Log.v(TAG, "surfaceDestroyed"); mSurfaceHolder = null; - mController.stopPreview(); + mController.onPreviewUIDestroyed(); } public View getRootView() { |