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

Commit 171ad634 authored by Tom Taylor's avatar Tom Taylor Committed by Android Git Automerger
Browse files

am 6c618c68: Merge change Ie7105dae into eclair 

Merge commit '6c618c68' into eclair-mr2

* commit '6c618c68':
  Handle bad SIM message
parents e981c334 6c618c68

telephony/java/android/telephony/SmsManager.java

+3 −1
Original line number Diff line number Diff line
@@ -360,10 +360,12 @@ public final class SmsManager { 
                // List contains all records, including "free" records (null)

                if (data != null) {

                    SmsMessage sms = SmsMessage.createFromEfRecord(i+1, data.getBytes());

                    if (sms != null) {

                        messages.add(sms);

                    }

                }

            }

        }

        return messages;

    }

telephony/java/android/telephony/SmsMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ public class SmsMessage { 
                    index, data);

        }



        return new SmsMessage(wrappedMessage);

        return wrappedMessage != null ? new SmsMessage(wrappedMessage) : null;

    }



    /**