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

Commit 14458de5 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Reduce binder call when determing whether or not to use CDMA format for...

Merge "Reduce binder call when determing whether or not to use CDMA format for MO SMS" into lmp-mr1-dev
parents 5e500806 47f25ad7
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -80,8 +80,9 @@ public class Sms7BitEncodingTranslator {
                (mTranslationTableGSM != null && mTranslationTableGSM.size() > 0) ||
                (mTranslationTableCDMA != null && mTranslationTableCDMA.size() > 0)) {
            char[] output = new char[size];
            boolean isCdmaFormat = useCdmaFormatForMoSms();
            for (int i = 0; i < size; i++) {
                output[i] = translateIfNeeded(message.charAt(i));
                output[i] = translateIfNeeded(message.charAt(i), isCdmaFormat);
            }

            return String.valueOf(output);
@@ -101,8 +102,8 @@ public class Sms7BitEncodingTranslator {
     *         space, if no mapping is found in the translation table for such
     *         character
     */
    private static char translateIfNeeded(char c) {
        if (noTranslationNeeded(c)) {
    private static char translateIfNeeded(char c, boolean isCdmaFormat) {
        if (noTranslationNeeded(c, isCdmaFormat)) {
            if (DBG) {
                Rlog.v(TAG, "No translation needed for " + Integer.toHexString(c));
            }
@@ -123,7 +124,7 @@ public class Sms7BitEncodingTranslator {
        }

        if (translation == -1) {
            if (useCdmaFormatForMoSms()) {
            if (isCdmaFormat) {
                if (mTranslationTableCDMA != null) {
                    translation = mTranslationTableCDMA.get(c, -1);
                }
@@ -149,8 +150,8 @@ public class Sms7BitEncodingTranslator {
        }
    }

    private static boolean noTranslationNeeded(char c) {
        if (useCdmaFormatForMoSms()) {
    private static boolean noTranslationNeeded(char c, boolean isCdmaFormat) {
        if (isCdmaFormat) {
            return GsmAlphabet.isGsmSeptets(c) && UserData.charToAscii.get(c, -1) != -1;
        }
        else {