commit 66e1e7324f9ffdc7324da2e10b5b361269887b9b
author Amit Mahajan <amitmahajan@google.com> Fri Feb 06 05:44:42 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 06 05:44:42 2015 +0000
tree 7c957930eb400c3d8ab1d998e5cfb000ecc0f030
parent 400d01874a3c75e50595cd7623c5dfb2def3bcca
parent 6683f0f020cae8b646af3255d7745a2d66e431f9

am 14458de5: Merge "Reduce binder call when determing whether or not to use CDMA format for MO SMS" into lmp-mr1-dev
automerge: 6683f0f

* commit '6683f0f020cae8b646af3255d7745a2d66e431f9':
  Reduce binder call when determing whether or not to use CDMA format for MO SMS

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

diff --git a/src/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java b/src/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java
index 6cb1f14..439eaea 100644
--- a/src/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java
+++ b/src/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java
@@ -80,8 +80,9 @@
                 (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 @@
      *         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 @@
         }
 
         if (translation == -1) {
-            if (useCdmaFormatForMoSms()) {
+            if (isCdmaFormat) {
                 if (mTranslationTableCDMA != null) {
                     translation = mTranslationTableCDMA.get(c, -1);
                 }
@@ -149,8 +150,8 @@
         }
     }
 
-    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 {