diff options
author | Sailesh Nepal <sail@google.com> | 2015-05-14 18:28:10 -0700 |
---|---|---|
committer | Sailesh Nepal <sail@google.com> | 2015-05-14 18:28:10 -0700 |
commit | d9be9cfe5eaef0a5241494a06beae6422dbe0fc3 (patch) | |
tree | ec80234dc870d1686802e2a68399a760d2466440 /telecomm | |
parent | 5bcbf857d129f4513e562801a4e88077b2655ade (diff) | |
download | frameworks_base-d9be9cfe5eaef0a5241494a06beae6422dbe0fc3.zip frameworks_base-d9be9cfe5eaef0a5241494a06beae6422dbe0fc3.tar.gz frameworks_base-d9be9cfe5eaef0a5241494a06beae6422dbe0fc3.tar.bz2 |
Fix in-call UI crash on Nova devcies (framework/base)
If a status hint icon wasn't set we'd crash.
Fix was to set StatusHitns.mIcon to null if the icon resource ID'
was 0.
BUG: 21168985
Change-Id: I33c06169f9e184b063e6fd10f77408bc262ea3c8
Diffstat (limited to 'telecomm')
-rw-r--r-- | telecomm/java/android/telecom/StatusHints.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public final class StatusHints implements Parcelable { @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) { |