commit 0db72b85bb057844277e8fe319815a05337521a4
author Yorke Lee <yorkelee@google.com> Fri Jun 19 16:04:43 2015 -0700
committer Yorke Lee <yorkelee@google.com> Fri Jun 19 16:04:43 2015 -0700
tree bc6340931dc10c287b1712868c4ef9ce11b63d8f
parent 82aacfdcd417c694f20baf53b187d78770688f99

Fix NPE in PhoneAccountSettingsFragment

Bug: 21958275
Change-Id: I95d9632ed3795ae7408d1fe73288f69012038f5f

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) {