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

Commit 4b02e59f authored by kaiyiz's avatar kaiyiz Committed by Gerrit - the friendly Code Review server
Browse files

Change the separator of anr to ":". 

The "," in anr file has special meaning.
If number contains ",", it will turn two separate num when copied to Sim.
Change the separate symbol to ":", and split the number with ":".

CRs-Fixed:  732861

Change-Id: I4e217ee2b1fed4bd1a897852e5152561275d8946
parent 7f4305fb

src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java

+9 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ public abstract class IccPhoneBookInterfaceManager { 
        String newAnr = values.getAsString(IccProvider.STR_NEW_ANRS);

        String[] oldEmailArray = TextUtils.isEmpty(oldEmail) ? null : getStringArray(oldEmail);

        String[] newEmailArray = TextUtils.isEmpty(newEmail) ? null : getStringArray(newEmail);

        String[] oldAnrArray = TextUtils.isEmpty(oldAnr) ? null : getStringArray(oldAnr);

        String[] newAnrArray = TextUtils.isEmpty(newAnr) ? null : getStringArray(newAnr);

        String[] oldAnrArray = TextUtils.isEmpty(oldAnr) ? null : getAnrStringArray(oldAnr);

        String[] newAnrArray = TextUtils.isEmpty(newAnr) ? null : getAnrStringArray(newAnr);

        efid = updateEfForIccType(efid);



        if (DBG)
@@ -404,6 +404,13 @@ public abstract class IccPhoneBookInterfaceManager { 
        }

    }



    private String[] getAnrStringArray(String str) {

        if (str != null) {

            return str.split(":");

        }

        return null;

    }



    private String[] getStringArray(String str) {

        if (str != null) {

            return str.split(",");

src/java/com/android/internal/telephony/IccProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ public class IccProvider extends ContentProvider { 
                for (String anr : anrs) {

                    if (DBG) log("Adding anr:" + anr);

                    anrString.append(anr);

                    anrString.append(",");

                    anrString.append(":");

                }

                contact[3] = anrString.toString();

            }