summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2009-08-11 18:12:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-11 18:12:14 -0700
commit0b34a0cfd55f816b4aa0f0a9a14bf4f491992b9a (patch)
tree7ac0e4ca935e4ec84f13677d8e868d1393fc26b8 /samples
parentf8be458476999972309c76c5b210ec8ad63fb30c (diff)
parentc5c912e49bdc89a7a7778b66d1ca6b00440d2888 (diff)
downloadandroid_development-0b34a0cfd55f816b4aa0f0a9a14bf4f491992b9a.tar.gz
android_development-0b34a0cfd55f816b4aa0f0a9a14bf4f491992b9a.tar.bz2
android_development-0b34a0cfd55f816b4aa0f0a9a14bf4f491992b9a.zip
am c5c912e4: Merge change 20717 into donut
Merge commit 'c5c912e49bdc89a7a7778b66d1ca6b00440d2888' * commit 'c5c912e49bdc89a7a7778b66d1ca6b00440d2888': Release the camera in surfaceDestroyed().
Diffstat (limited to 'samples')
-rw-r--r--samples/ApiDemos/src/com/example/android/apis/graphics/CameraPreview.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/CameraPreview.java b/samples/ApiDemos/src/com/example/android/apis/graphics/CameraPreview.java
index ceff15042..e3cf97696 100644
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/CameraPreview.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/CameraPreview.java
@@ -78,6 +78,7 @@ class Preview extends SurfaceView implements SurfaceHolder.Callback {
// Because the CameraDevice object is not a shared resource, it's very
// important to release it when the activity is paused.
mCamera.stopPreview();
+ mCamera.release();
mCamera = null;
}