commit 8309a19181151a78a288368becd3d3a9b1b1e389
author Sailesh Nepal <sail@google.com> Fri May 15 01:40:09 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 15 01:40:26 2015 +0000
tree e78954db58a91580a06761dfabee6235fb94110b
parent d76a81f5195b8a23b136f5a9965d3b5dd12a195d
parent d9be9cfe5eaef0a5241494a06beae6422dbe0fc3

Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev

telecomm/java/android/telecom/StatusHints.java

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