commit 3bc0c96d2446a4415a09a84e027e54fa0be6c5c6
author Yorke Lee <yorkelee@google.com> Thu Oct 08 17:06:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 08 17:06:23 2015 +0000
tree f6a6b75762fb7f0822eafb42bfd156ef8aa34b58
parent c6720cf6692cf64e1dfb9b99d96039ca87ce41bb
parent c7f8899a3ea60fb2c1059b79c18d2b4bc2511c6b

am c7f8899a: Don\'t assign invalid resource to imageView

* commit 'c7f8899a3ea60fb2c1059b79c18d2b4bc2511c6b':
  Don't assign invalid resource to imageView

src/com/android/dialer/widget/EmptyContentView.java

diff --git a/src/com/android/dialer/widget/EmptyContentView.java b/src/com/android/dialer/widget/EmptyContentView.java
index f248967..719fd3f 100644
--- a/src/com/android/dialer/widget/EmptyContentView.java
+++ b/src/com/android/dialer/widget/EmptyContentView.java
@@ -80,10 +80,11 @@
     }
 
     public void setImage(int resourceId) {
-        mImageView.setImageResource(resourceId);
         if (resourceId == NO_LABEL) {
+            mImageView.setImageDrawable(null);
             mImageView.setVisibility(View.GONE);
         } else {
+            mImageView.setImageResource(resourceId);
             mImageView.setVisibility(View.VISIBLE);
         }
     }