diff options
| author | Doris Liu <tianliu@google.com> | 2013-02-23 00:04:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-23 00:04:22 +0000 |
| commit | e455b777139921c5e72a9afca3f9ba3ae21975ba (patch) | |
| tree | 5157bf27c6bbc0111fd6bca33a41b1b488294d3c /src/com | |
| parent | 5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820 (diff) | |
| parent | 67de663ca106c32cf0b1f4fdf676f0fb10c30b83 (diff) | |
| download | android_packages_apps_Gallery2-e455b777139921c5e72a9afca3f9ba3ae21975ba.tar.gz android_packages_apps_Gallery2-e455b777139921c5e72a9afca3f9ba3ae21975ba.tar.bz2 android_packages_apps_Gallery2-e455b777139921c5e72a9afca3f9ba3ae21975ba.zip | |
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
Diffstat (limited to 'src/com')
| -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. |