am a4a4135c: am 5a1110cb: am 3c479905: Merge "NetworkImage - fix nullPointerException."
* commit 'a4a4135c97ee4de94df78630cbe48965b19c9513':
NetworkImage - fix nullPointerException.
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.