commit fc396f9e45b593d032ca92a09a3e95ee681363ee
author Yorke Lee <yorkelee@google.com> Sat Jun 20 00:23:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 20 00:23:15 2015 +0000
tree a1747c6dd77d85e042950cfa7e1bcd499f1080cb
parent dc999834d7b63ef48566722beb00ca681c2817ed
parent 95f140a881dad1130139cd98168ef54f73e608a5

am 95f140a8: am 135e380f: am 57686525: Merge "Fix NPE in PhoneAccountSettingsFragment" into mnc-dev

* commit '95f140a881dad1130139cd98168ef54f73e608a5':
  Fix NPE in PhoneAccountSettingsFragment

src/com/android/phone/settings/PhoneAccountSettingsFragment.java

diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index 112610b..dd9c050 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -366,7 +366,9 @@
 
             // Add an icon.
             Icon icon = account.getIcon();
-            accountPreference.setIcon(icon.loadDrawable(getActivity()));
+            if (icon != null) {
+                accountPreference.setIcon(icon.loadDrawable(getActivity()));
+            }
 
             // Add an intent to send the user to the account's settings.
             if (intent != null) {