commit a4cddf7e7832368b861c8b79978c58c7cc1476c8
author Adam Copp <adamcopp@google.com> Mon Mar 18 18:23:43 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 18 18:23:43 2013 +0000
tree 7d7b5b0bd1a013065cbda0ccfa427ec24b736cac
parent 57a99cbce5f384c210af0cd809bf38f46fa99d1e
parent 0c8b9eda5311dfc69ff532353c3e7f4ee6c1acb7

Merge "Hide the spinner and show failure message if photo data is null" into jb-mr2-dev

src/com/android/ex/photo/fragments/PhotoViewFragment.java

diff --git a/src/com/android/ex/photo/fragments/PhotoViewFragment.java b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
index 6702bd8..174fc10 100644
--- a/src/com/android/ex/photo/fragments/PhotoViewFragment.java
+++ b/src/com/android/ex/photo/fragments/PhotoViewFragment.java
@@ -329,8 +329,7 @@
                 enableImageTransforms(false);
                 break;
             case LOADER_ID_PHOTO:
-
-                if (result.status == BitmapResult.STATUS_EXCEPTION) {
+                if (result.status == BitmapResult.STATUS_EXCEPTION || data == null) {
                     mProgressBarNeeded = false;
                     mEmptyText.setText(R.string.failed);
                     mEmptyText.setVisibility(View.VISIBLE);