diff options
| author | Michael Kolb <kolby@google.com> | 2013-03-29 17:26:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-29 17:26:07 +0000 |
| commit | d6f3162a473066a24838c8dc6f2c6f96d4db0f0c (patch) | |
| tree | c529d58352e2e484b2d049c6d48baabc5d9b283d /src | |
| parent | 7857fc5931953ed5d63fbcbd1c810740f6e0eef6 (diff) | |
| parent | 0925a4e9d7f62f57cf9d8ed40ce22d08af1583a3 (diff) | |
| download | android_packages_apps_Snap-d6f3162a473066a24838c8dc6f2c6f96d4db0f0c.tar.gz android_packages_apps_Snap-d6f3162a473066a24838c8dc6f2c6f96d4db0f0c.tar.bz2 android_packages_apps_Snap-d6f3162a473066a24838c8dc6f2c6f96d4db0f0c.zip | |
Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java index 0306e295c..65b2bb83a 100644 --- a/src/com/android/camera/CameraManager.java +++ b/src/com/android/camera/CameraManager.java @@ -321,7 +321,10 @@ public class CameraManager { } public void release() { + // release() must be synchronous so we know exactly when the camera + // is released and can continue on. mCameraHandler.sendEmptyMessage(RELEASE); + waitDone(); } public void reconnect() throws IOException { |