From 72fac6778119e42f39e00f5b7e36b7500893f45c Mon Sep 17 00:00:00 2001
From: Tom Taylor <tomtaylor@google.com>
Date: Thu, 22 Oct 2009 11:42:10 -0700
Subject: Handle bad SIM message

When trying to view the saved sms messages on my SIM, I ran into a null ref.
With this fix, we don't try and wrap a null message, but just skip it.
This is part one of three fixes for BC-triaged bug 2205782.

Change-Id: Ie7105dae7e3134b98681deabcc14f5db555902f3
---
 telephony/java/android/telephony/SmsManager.java | 4 +++-
 telephony/java/android/telephony/SmsMessage.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'telephony')

diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java
index 80de074..3122722 100644
--- a/telephony/java/android/telephony/SmsManager.java
+++ b/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);
+                    }
                 }
             }
         }
diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java
index 7a10512..b8ea4c0 100644
--- a/telephony/java/android/telephony/SmsMessage.java
+++ b/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;
     }
 
     /**
-- 
cgit v1.1