Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8c854d6 authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

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

am: 36ef5953

Change-Id: Ia05d2efe67e30bde8a5d0b7f3c75e9651e65caf3
parents dd290c56 36ef5953

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

+14 −4
Original line number Diff line number Diff line
@@ -970,10 +970,20 @@ public class BluetoothPbapVcardManager { 
        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();

                }

            }

        }