am 6ef38fb4: am cea8f8e4: Merge change I4219797a into eclair

Merge commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6' into eclair-mr2-plus-aosp

* commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6':
  Log exception if we hit an error parsing an incoming SMS message.

telephony/java/com/android/internal/telephony/SMSDispatcher.java

@@ -303,6 +303,7 @@ public abstract class SMSDispatcher extends Handler {
                     notifyAndAcknowledgeLastIncomingSms(handled, result, null);
                 }
             } catch (RuntimeException ex) {
+                Log.e(TAG, "Exception dispatching message", ex);
                 notifyAndAcknowledgeLastIncomingSms(false, Intents.RESULT_SMS_GENERIC_ERROR, null);
             }
 

telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

@@ -100,6 +100,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher {
 
         // If sms is null, means there was a parsing error.
         if (smsb == null) {
+            Log.e(TAG, "dispatchMessage: message is null");
             return Intents.RESULT_SMS_GENERIC_ERROR;
         }