summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-03-28 17:07:03 -0700
committerAngus Kong <shkong@google.com>2013-03-28 17:27:00 -0700
commiteb543cfb2f598b68791321a7747cdba02204e1fa (patch)
tree75d8da261fd071ffe13a124085e66247b6dd1db8 /src
parent10bd1e0c43b39ad3314a213822403588141cc7f5 (diff)
downloadandroid_packages_apps_Gallery2-eb543cfb2f598b68791321a7747cdba02204e1fa.tar.gz
android_packages_apps_Gallery2-eb543cfb2f598b68791321a7747cdba02204e1fa.tar.bz2
android_packages_apps_Gallery2-eb543cfb2f598b68791321a7747cdba02204e1fa.zip
Make camera releasing synchronous.
bug:8502943 Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/CameraManager.java3
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 {