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

Commit 96827563 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Contacts: Change the separator of anr to &"

parents 13897022 7b84b40b

src/com/android/contacts/ContactSaveService.java

+2 −2
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ public class ContactSaveService extends IntentService { 
        }



        if (!TextUtils.isEmpty(anr)) {

            String[] anrs = anr.split(",");

            String[] anrs = anr.split(SimContactsConstants.ANR_SEP);

            if (anrs != null) {

                if (anrs.length > MoreContactUtils

                        .getOneSimAnrCount(subscription)) {
@@ -672,7 +672,7 @@ public class ContactSaveService extends IntentService { 
        }



        if (!TextUtils.isEmpty(email)) {

            String[] emails = email.split(",");

            String[] emails = email.split(SimContactsConstants.EMAIL_SEP);

            for (String mEmail : emails) {

                if (mEmail != null && mEmail.length() > MAX_EMAIL_LENGTH) {

                    return RESULT_EMAIL_FAILURE;

src/com/android/contacts/editor/MultiPickContactActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ public class MultiPickContactActivity extends ListActivity implements 
            emailAddressArray = null;

        }

        if (!TextUtils.isEmpty(anrs)) {

            anrArray = anrs.split(",");

            anrArray = anrs.split(SimContactsConstants.ANR_SEP);

        } else {

            anrArray = null;

        }

src/com/android/contacts/quickcontact/QuickContactActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -2820,7 +2820,7 @@ public class QuickContactActivity extends ContactsActivity { 
                                        0, MoreContactUtils.MAX_LENGTH_NUMBER_IN_SIM);

                            }

                            strAnrNum.append(s);

                            strAnrNum.append(",");

                            strAnrNum.append(SimContactsConstants.ANR_SEP);

                        }

                        StringBuilder strEmail = new StringBuilder();

                        for (int j = 0; j < arrayEmail.size(); j++) {
@@ -2830,7 +2830,7 @@ public class QuickContactActivity extends ContactsActivity { 
                                        0, MoreContactUtils.MAX_LENGTH_EMAIL_IN_SIM);

                            }

                            strEmail.append(s);

                            strEmail.append(",");

                            strEmail.append(SimContactsConstants.EMAIL_SEP);

                        }

                        itemUri = MoreContactUtils.insertToCard(QuickContactActivity.this, strName,

                                strNum, strEmail.toString(), strAnrNum.toString(), sub);