commit a062794ce49c8d7ef7da99afe269fd1e8351770a
author Hemant Gupta <hemantg@codeaurora.org> Thu Nov 16 23:14:07 2017 +0530
committer Hemant Gupta <hemantg@codeaurora.org> Thu Nov 23 00:19:38 2017 +0530
tree f0ccf90846e9a6992c8dbd2f65dd94a4fbad3971
parent 1ba0baeb4c11f5b9c1a2c24116ee4935c4bad18a

PBAP: Handle '-' in TEL field properly when custom TAG is used.

Precondition:
DUT has some contacts stored along with phonenumber(s) stored
with custom tag option.

Usecase:
1) Connect with carkit supporting PBAP
2) Send download phonebook from carkit

Expectation:
Carkit is able to show all phonebook contacts and numbers stored on DUT

Observation:
Carkit is unable to show some phonenumbers stored with custom tag option.

Issue:
For Contacts with custom Tel field, "-" is deleted from tag syntax.
Proper Format: X-TAG:<TEL_Number>
Received Format : XTAG:<TEL_Number>

Issue:
For Contacts with custom Tel field, "-" is deleted from tag syntax.
Proper Format: X-TAG:<TEL_Number>

Root Cause:
"-" is getting deleted from TEL number and "X-TAG" as well when
custom tag is used for contact.

Fix:
remove "-" only from TEL number without removing it from "X-TAG".

Test: Tested that carkit is able to show all contacts/numbers properly
stored even with custom fields.

Bug: 37712333
Change-Id: Id4cafa5de44e90a215c18053c872e9b40792eba3

android/app/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

diff --git a/android/app/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/android/app/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
index 17ceb9f..5aed5f1 100644
--- a/android/app/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
+++ b/android/app/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
@@ -970,10 +970,20 @@
         String stripedVCard = "";
         for (int i = 0; i < attr.length; i++) {
             if (attr[i].startsWith("TEL")) {
-                attr[i] = attr[i].replace("(", "");
-                attr[i] = attr[i].replace(")", "");
-                attr[i] = attr[i].replace("-", "");
-                attr[i] = attr[i].replace(" ", "");
+                String[] vTagAndTel = attr[i].split(":", 2);
+                int telLenBefore = vTagAndTel[1].length();
+                // Remove '-', '(', ')' or ' ' from TEL number
+                vTagAndTel[1] = vTagAndTel[1].replace("-", "")
+                                             .replace("(", "")
+                                             .replace(")", "")
+                                             .replace(" ", "");
+                if (vTagAndTel[1].length() < telLenBefore) {
+                    if (V) {
+                        Log.v(TAG, "Fixing vCard TEL to " + vTagAndTel[1]);
+                    }
+                    attr[i] = new StringBuilder().append(vTagAndTel[0]).append(":")
+                                                 .append(vTagAndTel[1]).toString();
+                }
             }
         }