diff options
| author | Doris Liu <tianliu@google.com> | 2013-02-22 16:07:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-22 16:07:19 -0800 |
| commit | 0af269dc91098dfd6c2577ba81392793aec43305 (patch) | |
| tree | c63e12919c425b95b8492843604bfc11028d83f6 | |
| parent | 138a617c8fd3b1e6c31fac397fd6505d355bda2a (diff) | |
| parent | e455b777139921c5e72a9afca3f9ba3ae21975ba (diff) | |
| download | android_packages_apps_Gallery2-0af269dc91098dfd6c2577ba81392793aec43305.tar.gz android_packages_apps_Gallery2-0af269dc91098dfd6c2577ba81392793aec43305.tar.bz2 android_packages_apps_Gallery2-0af269dc91098dfd6c2577ba81392793aec43305.zip | |
am e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
* commit 'e455b777139921c5e72a9afca3f9ba3ae21975ba':
Release surface texture to fix gray camera preview
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 15f40461d..e244d6b88 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. |