diff options
| author | Mia Dolkow <mia.mansson@volvocars.com> | 2021-02-04 11:06:44 +0100 |
|---|---|---|
| committer | Mia Dolkow <mia.mansson@volvocars.com> | 2023-11-28 13:54:25 +0100 |
| commit | 080dabd386ba659e304d04bc612306a30eeac422 (patch) | |
| tree | 741c3fdafdea8f8a1ed6375312de57201ae49bbb | |
| parent | 78368d452cca8a204d0378c09ee114eb3b1f7ad8 (diff) | |
| download | vcard-080dabd386ba659e304d04bc612306a30eeac422.tar.gz | |
Default to OTHER if label is unknown
Default to OTHER rather than HOME when label has not
been set in the vCard.
By defaulting to HOME, a contact card may end up with
several phone numbers labelled as HOME. This may cause
confusion to the user as HOME is expected to have been
chosen intentionally for only specific numbers.
Bug: 178625695
Test: atest AndroidVCardTests
Based-on-patch-by: Mats Fagerstrom <mats.fagerstrom@volvocars.com>
Change-Id: I89f685b4c146e2166107a3d7b886babb0db52e7d
(cherry-picked from a57766299157865e8d917e2ec93688aa8bbb9c6e)
Change-Id: Id4ecab4b9e65583e53079b3d474cf4107b0f542e
| -rw-r--r-- | java/com/android/vcard/VCardUtils.java | 4 | ||||
| -rw-r--r-- | tests/src/com/android/vcard/tests/VCardImporterTests.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/com/android/vcard/VCardUtils.java b/java/com/android/vcard/VCardUtils.java index 5890fb4..aa335d3 100644 --- a/java/com/android/vcard/VCardUtils.java +++ b/java/com/android/vcard/VCardUtils.java @@ -253,8 +253,8 @@ public class VCardUtils { if (hasPref) { type = Phone.TYPE_MAIN; } else { - // default to TYPE_HOME - type = Phone.TYPE_HOME; + // default to TYPE_OTHER + type = Phone.TYPE_OTHER; } } if (isFax) { diff --git a/tests/src/com/android/vcard/tests/VCardImporterTests.java b/tests/src/com/android/vcard/tests/VCardImporterTests.java index b4713d0..6ec02b6 100644 --- a/tests/src/com/android/vcard/tests/VCardImporterTests.java +++ b/tests/src/com/android/vcard/tests/VCardImporterTests.java @@ -674,7 +674,7 @@ public class VCardImporterTests extends VCardTestsBase { .put(Phone.TYPE, Phone.TYPE_HOME) .put(Phone.NUMBER, "404-555-1212"); elem.addExpected(Phone.CONTENT_ITEM_TYPE) - .put(Phone.TYPE, Phone.TYPE_FAX_HOME) + .put(Phone.TYPE, Phone.TYPE_OTHER_FAX) .put(Phone.NUMBER, "4045551212,*#55"); elem.addExpected(Phone.CONTENT_ITEM_TYPE) .put(Phone.TYPE, Phone.TYPE_MOBILE) @@ -1379,7 +1379,7 @@ public class VCardImporterTests extends VCardTestsBase { .put(StructuredName.DISPLAY_NAME, "Pause Wait"); // See PhoneNumberUtils in Android SDK. elem.addExpected(Phone.CONTENT_ITEM_TYPE) - .put(Phone.TYPE, Phone.TYPE_HOME) + .put(Phone.TYPE, Phone.TYPE_OTHER) .put(Phone.NUMBER, ",1234,5678;9"); } |