Fix null PhoneAccountMeta data crash
Change-Id: Ifb9c7fea6f95aa8662cc3780ff2ee92ace8572ef
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 9e400d7..32becd2 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -22,6 +22,7 @@
import android.graphics.drawable.Drawable;
import android.telecomm.CallCapabilities;
import android.telecomm.PhoneAccount;
+import android.telecomm.PhoneAccountMetadata;
import android.telecomm.TelecommManager;
import android.telephony.DisconnectCause;
import android.text.TextUtils;
@@ -406,8 +407,10 @@
private Drawable getConnectionIcon() {
PhoneAccount account = mPrimary.getAccount();
if (account != null) {
- return getTelecommManager().getPhoneAccountMetadata(account)
- .getIcon(mContext);
+ PhoneAccountMetadata data = getTelecommManager().getPhoneAccountMetadata(account);
+ if (data != null) {
+ return data.getIcon(mContext);
+ }
}
return null;
}
@@ -431,7 +434,10 @@
}
PhoneAccount account = mPrimary.getAccount();
if (account != null) {
- return getTelecommManager().getPhoneAccountMetadata(account).getLabel();
+ PhoneAccountMetadata data = getTelecommManager().getPhoneAccountMetadata(account);
+ if (data != null) {
+ return data.getLabel();
+ }
}
return null;
}
@@ -439,7 +445,10 @@
private String getSecondaryCallProviderLabel() {
PhoneAccount account = mSecondary.getAccount();
if (account != null) {
- return getTelecommManager().getPhoneAccountMetadata(account).getLabel();
+ PhoneAccountMetadata data = getTelecommManager().getPhoneAccountMetadata(account);
+ if (data != null) {
+ return data.getLabel();
+ }
}
return null;
}
@@ -447,8 +456,10 @@
private Drawable getSecondaryCallProviderIcon() {
PhoneAccount account = mSecondary.getAccount();
if (account != null) {
- return getTelecommManager().getPhoneAccountMetadata(account)
- .getIcon(mContext);
+ PhoneAccountMetadata data = getTelecommManager().getPhoneAccountMetadata(account);
+ if (data != null) {
+ return data.getIcon(mContext);
+ }
}
return null;
}