commit 3c479905a362798c6c3694bb2717de53f2206975
author Ficus Kirkpatrick <ficus@android.com> Mon Jul 01 18:48:55 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 01 18:48:55 2013 +0000
tree db1775295eb3d9cac321ec25d557a20ab277218d
parent 4f090d9b9936ce6be7dbf46015193a4f61166816
parent c3dce982fb05a7674d360255a9831adf83475099

Merge "NetworkImage - fix nullPointerException."

src/com/android/volley/toolbox/NetworkImageView.java

diff --git a/src/com/android/volley/toolbox/NetworkImageView.java b/src/com/android/volley/toolbox/NetworkImageView.java
index d4f14e9..74c9159 100644
--- a/src/com/android/volley/toolbox/NetworkImageView.java
+++ b/src/com/android/volley/toolbox/NetworkImageView.java
@@ -18,8 +18,8 @@
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.ImageView;
-import android.widget.LinearLayout.LayoutParams;
 
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.ImageLoader.ImageContainer;
@@ -104,7 +104,8 @@
         int width = getWidth();
         int height = getHeight();
 
-        boolean isFullyWrapContent = getLayoutParams().height == LayoutParams.WRAP_CONTENT
+        boolean isFullyWrapContent = getLayoutParams() != null
+                && getLayoutParams().height == LayoutParams.WRAP_CONTENT
                 && getLayoutParams().width == LayoutParams.WRAP_CONTENT;
         // if the view's bounds aren't known yet, and this is not a wrap-content/wrap-content
         // view, hold off on loading the image.