diff options
| author | Fei Wang <wangzfei@google.com> | 2023-11-30 17:46:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-30 17:46:28 +0000 |
| commit | 7bdf4fe3614f4537aed2ae53dd713a8a38e97138 (patch) | |
| tree | 741c3fdafdea8f8a1ed6375312de57201ae49bbb | |
| parent | 904a9fa7d3bcc76678911cda4b35d7a7f9bf24be (diff) | |
| parent | d405e2d372a83ab7e27860208f33bbf10a60f953 (diff) | |
| download | vcard-7bdf4fe3614f4537aed2ae53dd713a8a38e97138.tar.gz | |
Merge "Default to OTHER if label is unknown" into main am: 3377593ed6 am: c8bd76cd1c am: d405e2d372
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/vcard/+/2849741
Change-Id: I3c5ea7e6de0af95ca765cdb2d429390f5fcd058c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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"); } |