From 0cefcea01849364be6955a1b3f7e7d1639010abc Mon Sep 17 00:00:00 2001 From: Angus Kong Date: Thu, 17 Nov 2011 18:11:23 +0800 Subject: Fix OpenGL processing when activity is not active. bug:5624690 Change-Id: I87af684e165a275adb4b765a86a2df2b62137ca0 --- src/com/android/camera/panorama/PanoramaActivity.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/com') diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java index a99e7be..bda0381 100755 --- a/src/com/android/camera/panorama/PanoramaActivity.java +++ b/src/com/android/camera/panorama/PanoramaActivity.java @@ -492,10 +492,16 @@ public class PanoramaActivity extends ActivityBase implements /* This function may be called by some random thread, * so let's be safe and use synchronize. No OpenGL calls can be done here. */ + // Frames might still be available after the activity is paused. If we call onFrameAvailable + // after pausing, the GL thread will crash. + if (mPausing) return; + // Updating the texture should be done in the GL thread which mMosaicView is attached. mMosaicView.queueEvent(new Runnable() { @Override public void run() { + // Check if the activity is paused here can speed up the onPause() process. + if (mPausing) return; mSurfaceTexture.updateTexImage(); mSurfaceTexture.getTransformMatrix(mTransformMatrix); } -- cgit v1.1