Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6c618c68: Merge change Ie7105dae into eclair

Browse Source 
Merge commit '6c618c68f251e42210f7c2f45d69498352da87e0' into eclair-mr2

* commit '6c618c68f251e42210f7c2f45d69498352da87e0':
  Handle bad SIM message
This commit is contained in:
Tom Taylor
2009-10-22 15:47:06 -07:00
committed by Android Git Automerger
parent e981c33446 6c618c68f2
commit 171ad63488
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/SmsManager.java
View File

@@ -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);
}
}
}
}

2
telephony/java/android/telephony/SmsMessage.java
View File

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