auto import from //depot/cupcake/@132589

telephony/java/android/telephony/gsm/SmsMessage.java

@@ -467,7 +467,7 @@ public class SmsMessage {
      *         units remaining until the next message. int[3] is the encoding
      *         type that should be used for the message.
      */
-    public static int[] calculateLength(CharSequence messageBody, boolean use7bitOnly) {
+    public static int[] calculateLength(String messageBody, boolean use7bitOnly) {
         int ret[] = new int[4];
 
         try {
@@ -502,25 +502,6 @@ public class SmsMessage {
         return ret;
     }
 
-    /**
-     * Calculates the number of SMS's required to encode the message body and
-     * the number of characters remaining until the next message, given the
-     * current encoding.
-     *
-     * @param messageBody the message to encode
-     * @param use7bitOnly if true, characters that are not part of the GSM
-     *         alphabet are counted as a single space char.  If false, a
-     *         messageBody containing non-GSM alphabet characters is calculated
-     *         for 16-bit encoding.
-     * @return an int[4] with int[0] being the number of SMS's required, int[1]
-     *         the number of code units used, and int[2] is the number of code
-     *         units remaining until the next message. int[3] is the encoding
-     *         type that should be used for the message.
-     */
-    public static int[] calculateLength(String messageBody, boolean use7bitOnly) {
-        return calculateLength((CharSequence)messageBody, use7bitOnly);
-    }
-    
 
     /**
      * Get an SMS-SUBMIT PDU for a destination address and a message
@@ -560,12 +541,7 @@ public class SmsMessage {
 
             // TP-Data-Coding-Scheme
             // Default encoding, uncompressed
-            // To test writing messages to the SIM card, change this value 0x00 to 0x12, which
-            // means "bits 1 and 0 contain message class, and the class is 2". Note that this
-            // takes effect for the sender. In other words, messages sent by the phone with this
-            // change will end up on the receiver's SIM card. You can then send messages to
-            // yourself (on a phone with this change) and they'll end up on the SIM card.
-            bo.write(0x00); 
+            bo.write(0x00);
 
             // (no TP-Validity-Period)
 

telephony/java/com/android/internal/telephony/gsm/DataConnectionTracker.java

@@ -884,9 +884,6 @@ final class DataConnectionTracker extends Handler
 
         isConnected = (state != State.IDLE && state != State.FAILED);
 
-        // The "current" may no longer be valid.  MMS depends on this to send properly.
-        phone.updateCurrentCarrierInProvider();
-
         // TODO: It'd be nice to only do this if the changed entrie(s)
         // match the current operator.
         createAllApnList();

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

@@ -1383,8 +1383,18 @@ public class GSMPhone extends PhoneBase {
                     break;
 
                 case EVENT_SIM_RECORDS_LOADED:
-                    updateCurrentCarrierInProvider();
-                    
+                    mSIMRecords.getSIMOperatorNumeric();
+
+                    try {
+                        //set the current field the telephony provider according to
+                        //the SIM's operator
+                        Uri uri = Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "current");
+                        ContentValues map = new ContentValues();
+                        map.put(Telephony.Carriers.NUMERIC, mSIMRecords.getSIMOperatorNumeric());
+                        mContext.getContentResolver().insert(uri, map);
+                    } catch (SQLException e) {
+                        Log.e(LOG_TAG, "Can't store current operator", e);
+                    }
                     // Check if this is a different SIM than the previous one. If so unset the
                     // voice mail number.
                     String imsi = getVmSimImsi();
@@ -1525,27 +1535,7 @@ public class GSMPhone extends PhoneBase {
             }
         }
     }
-
-    /**
-     * Sets the "current" field in the telephony provider according to the SIM's operator
-     * 
-     * @return true for success; false otherwise.
-     */
-    boolean updateCurrentCarrierInProvider() {
-        if (mSIMRecords != null) {
-            try {
-                Uri uri = Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "current");
-                ContentValues map = new ContentValues();
-                map.put(Telephony.Carriers.NUMERIC, mSIMRecords.getSIMOperatorNumeric());
-                mContext.getContentResolver().insert(uri, map);
-                return true;
-            } catch (SQLException e) {
-                Log.e(LOG_TAG, "Can't store current operator", e);
-            }
-        }
-        return false;
-    }
-
+    
     /**
      * Used to track the settings upon completion of the network change.
      */

telephony/java/com/android/internal/telephony/gsm/GsmAlphabet.java

@@ -532,7 +532,7 @@ public class GsmAlphabet
      * needed to represent this string. Counts unencodable char as 1 septet.
      */
     public static int
-    countGsmSeptets(CharSequence s)
+    countGsmSeptets(String s)
     {
         try {
             return countGsmSeptets(s, false);
@@ -549,7 +549,7 @@ public class GsmAlphabet
      * char. Otherwise, counts invalid char as 1 septet
      */
     public static int
-    countGsmSeptets(CharSequence s, boolean throwsException) throws EncodeException
+    countGsmSeptets(String s, boolean throwsException) throws EncodeException
     {
         int charIndex = 0;
         int sz = s.length();