commit c8bd76cd1cc3c04ec416b9911584d09da2f762a6
author Fei Wang <wangzfei@google.com> Thu Nov 30 16:40:49 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 30 16:40:49 2023 +0000
tree 741c3fdafdea8f8a1ed6375312de57201ae49bbb
parent 4502ff34f584060fb7262c613795c9164b87b621
parent 3377593ed636bdff5b7f546bca9500b9286d9a67

Merge "Default to OTHER if label is unknown" into main am: 3377593ed6

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/vcard/+/2849741

Change-Id: Ic5d294f5e89317fe0469a37d43781df80355a1d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

java/com/android/vcard/VCardUtils.java

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

tests/src/com/android/vcard/tests/VCardImporterTests.java

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 @@
                 .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 @@
                 .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");
     }