Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev
diff --git a/telecomm/java/android/telecom/StatusHints.java b/telecomm/java/android/telecom/StatusHints.java
index 99c8d7f..453f408 100644
--- a/telecomm/java/android/telecom/StatusHints.java
+++ b/telecomm/java/android/telecom/StatusHints.java
@@ -42,7 +42,8 @@
@SystemApi @Deprecated
public StatusHints(ComponentName packageName, CharSequence label, int iconResId,
Bundle extras) {
- this(label, Icon.createWithResource(packageName.getPackageName(), iconResId), extras);
+ this(label, iconResId == 0 ? null : Icon.createWithResource(packageName.getPackageName(),
+ iconResId), extras);
}
public StatusHints(CharSequence label, Icon icon, Bundle extras) {