diff options
| author | John Reck <jreck@google.com> | 2012-10-01 15:34:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-01 15:34:23 -0700 |
| commit | 9a6a288c152a924cc9f514e41f6fb19326095e07 (patch) | |
| tree | 0ab1111c8bfc27fff618eac74fd49cf2daf7e071 /src | |
| parent | 9dea0f8cacc6e58b3a078e45435af61fe48e33b9 (diff) | |
| parent | a75966002946f0f83df427c55694e688a611ed54 (diff) | |
| download | Camera-9a6a288c152a924cc9f514e41f6fb19326095e07.tar.gz | |
Merge "Verify we are receiving a callback for the current ST" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraScreenNail.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraScreenNail.java b/src/com/android/camera/CameraScreenNail.java index 2e820c10..d981af38 100644 --- a/src/com/android/camera/CameraScreenNail.java +++ b/src/com/android/camera/CameraScreenNail.java @@ -292,6 +292,9 @@ public class CameraScreenNail extends SurfaceTextureScreenNail { @Override public void onFrameAvailable(SurfaceTexture surfaceTexture) { synchronized (mLock) { + if (getSurfaceTexture() != surfaceTexture) { + return; + } mFirstFrameArrived = true; if (mVisible) { if (mAnimState == ANIM_SWITCH_WAITING_FIRST_FRAME) { |