diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-09-13 21:26:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-13 21:26:37 +0000 |
| commit | 7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25 (patch) | |
| tree | a5f36a282f178fb26a941f588f74ea4ebbdeba42 | |
| parent | a29e0bfcafa292adba7fff2daf0f754627e47137 (diff) | |
| parent | 6100053eea36f0258091ee12be5f72c501209ad0 (diff) | |
| download | android_packages_apps_Snap-7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25.tar.gz android_packages_apps_Snap-7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25.tar.bz2 android_packages_apps_Snap-7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25.zip | |
Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad
| -rw-r--r-- | src/com/android/camera/tinyplanet/TinyPlanetPreview.java | 6 |
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(); } |