From 6100053eea36f0258091ee12be5f72c501209ad0 Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Fri, 13 Sep 2013 13:42:29 -0700
Subject: Fix potential deadlock while rendering the preview.

  Bug: 10748013

Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502
---
 src/com/android/camera/tinyplanet/TinyPlanetPreview.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/camera/tinyplanet/TinyPlanetPreview.java b/src/com/android/camera/tinyplanet/TinyPlanetPreview.java
index 7e7aff5fa..153d266e1 100644
--- 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();
             }
-- 
cgit v1.2.3