summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-09-13 13:42:29 -0700
committerSascha Haeberling <haeberling@google.com>2013-09-13 13:42:29 -0700
commit6100053eea36f0258091ee12be5f72c501209ad0 (patch)
tree1b39877e63f6b35d3b057ce874c363766c115115
parent539b9eec067c012d17f482975cf8053e04a11759 (diff)
downloadandroid_packages_apps_Snap-6100053eea36f0258091ee12be5f72c501209ad0.tar.gz
android_packages_apps_Snap-6100053eea36f0258091ee12be5f72c501209ad0.tar.bz2
android_packages_apps_Snap-6100053eea36f0258091ee12be5f72c501209ad0.zip
Fix potential deadlock while rendering the preview.
Bug: 10748013 Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502
-rw-r--r--src/com/android/camera/tinyplanet/TinyPlanetPreview.java6
1 files 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();
}