diff options
| -rw-r--r-- | res/values-zh-rTW/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/contacts/common/model/dataitem/DataItem.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 6e5bda9b..99c622d0 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -188,7 +188,7 @@ <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"已完成 <xliff:g id="FILENAME">%s</xliff:g> 匯出作業。"</string> <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"匯出聯絡人完成。"</string> <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"聯絡人資料匯出完畢，按一下通知即可分享聯絡人資料。"</string> - <string name="touch_to_share_contacts" msgid="3237211496215699092">"輕觸即可分享聯絡人資料。"</string> + <string name="touch_to_share_contacts" msgid="3237211496215699092">"輕按即可分享聯絡人資料。"</string> <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"已取消匯出 <xliff:g id="FILENAME">%s</xliff:g>。"</string> <string name="exporting_contact_list_title" msgid="5663945499580026953">"正在匯出聯絡人資料"</string> <string name="exporting_contact_list_message" msgid="141905615542638683">"正在匯出聯絡人資料。"</string> diff --git a/src/com/android/contacts/common/model/dataitem/DataItem.java b/src/com/android/contacts/common/model/dataitem/DataItem.java index 780f4f59..4e66e325 100644 --- a/src/com/android/contacts/common/model/dataitem/DataItem.java +++ b/src/com/android/contacts/common/model/dataitem/DataItem.java @@ -152,7 +152,8 @@ public class DataItem implements Collapser.Collapsible<DataItem> { * video calling, {@code 0} otherwise. */ public int getCarrierPresence() { - return mContentValues.getAsInteger(Data.CARRIER_PRESENCE); + final Integer value = mContentValues.getAsInteger(Data.CARRIER_PRESENCE); + return value != null ? value.intValue() : 0; } /** |