Merge change Ie7105dae into eclair

* changes:
  Handle bad SIM message

telephony/java/android/telephony/SmsManager.java

@@ -360,7 +360,9 @@ public final class SmsManager {
                 // List contains all records, including "free" records (null)
                 if (data != null) {
                     SmsMessage sms = SmsMessage.createFromEfRecord(i+1, data.getBytes());
-                    messages.add(sms);
+                    if (sms != null) {
+                        messages.add(sms);
+                    }
                 }
             }
         }

telephony/java/android/telephony/SmsMessage.java

@@ -218,7 +218,7 @@ public class SmsMessage {
                     index, data);
         }
 
-        return new SmsMessage(wrappedMessage);
+        return wrappedMessage != null ? new SmsMessage(wrappedMessage) : null;
     }
 
     /**