summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-02-23 00:04:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-23 00:04:22 +0000
commit02ef5ba117462eda524820b6004f84d26b28f647 (patch)
treec2082bd784ad97d02a20868f6d71ae5553d5b11b
parent608ef5cf3a15f235aa7b6d80924edbdb0fda365b (diff)
parentb8cf250c6351cd96f069fd16087db5e7b0f6b1d6 (diff)
downloadandroid_packages_apps_Snap-02ef5ba117462eda524820b6004f84d26b28f647.zip
android_packages_apps_Snap-02ef5ba117462eda524820b6004f84d26b28f647.tar.gz
android_packages_apps_Snap-02ef5ba117462eda524820b6004f84d26b28f647.tar.bz2
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
-rw-r--r--src/com/android/camera/PhotoModule.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 15f4046..e244d6b 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1586,10 +1586,9 @@ public class PhotoModule
mCountDownView.cancelCountDown();
// Close the camera now because other activities may need to use it.
closeCamera();
- if (mSurfaceTexture != null) {
- ((CameraScreenNail) mActivity.mCameraScreenNail).releaseSurfaceTexture();
- mSurfaceTexture = null;
- }
+ // Release surface texture.
+ ((CameraScreenNail) mActivity.mCameraScreenNail).releaseSurfaceTexture();
+ mSurfaceTexture = null;
resetScreenOn();
// Clear UI.