Fix potential deadlock while rendering the preview.

  Bug: 10748013

Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502

diff --git a/src/com/android/camera/tinyplanet/TinyPlanetPreview.java b/src/com/android/camera/tinyplanet/TinyPlanetPreview.java
index 7e7aff5..153d266 100644 (file)
--- a/src/com/android/camera/tinyplanet/TinyPlanetPreview.java
+++ b/src/com/android/camera/tinyplanet/TinyPlanetPreview.java
@@ -79,9 +79,11 @@ public class TinyPlanetPreview extends View {
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        if (mLock != null && mLock.tryLock() && mPreview != null && !mPreview.isRecycled()) {
+        if (mLock != null && mLock.tryLock()) {
             try {
-                canvas.drawBitmap(mPreview, 0, 0, mPaint);
+                if (mPreview != null && !mPreview.isRecycled()) {
+                    canvas.drawBitmap(mPreview, 0, 0, mPaint);
+                }
             } finally {
                 mLock.unlock();
             }