NPE fix.
Make sure that we check the validity of the label before we
call a method on it. Also removed import of unused package.
Bug: 18572439
Change-Id: I4b9ae0b4ace4129fe92dcbd9abecc12620d45a86
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index 3979a3e..adeec0f 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -18,7 +18,6 @@
import android.content.ComponentName;
import android.content.Context;
-import android.graphics.drawable.Drawable;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
@@ -65,7 +64,10 @@
*/
public static String getAccountLabel(Context context, PhoneAccountHandle accountHandle) {
PhoneAccount account = getAccountOrNull(context, accountHandle);
- return account == null ? null : account.getLabel().toString();
+ if (account != null && account.getLabel() != null) {
+ return account.getLabel().toString();
+ }
+ return null;
}
/**