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

Commit 6ef38fb4 authored by jsh's avatar jsh Committed by Android Git Automerger
Browse files

am cea8f8e4: Merge change I4219797a into eclair 

Merge commit 'cea8f8e4' into eclair-mr2

* commit 'cea8f8e4':
  Log exception if we hit an error parsing an incoming SMS message.
parents 52f545c7 cea8f8e4

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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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;

        }