diff options
| author | Koushik Dutta <koushd@gmail.com> | 2013-07-24 18:49:27 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2013-07-24 18:49:27 -0700 |
| commit | 61aa925f47e4d0970739855236d91b2491f76ece (patch) | |
| tree | a6c6b36523c643940afd9462d36630861bc3900d /src | |
| parent | 7b04982355c57ecb024b5b46ed47e85e7763cde1 (diff) | |
| download | frameworks_opt_telephony-61aa925f47e4d0970739855236d91b2491f76ece.zip frameworks_opt_telephony-61aa925f47e4d0970739855236d91b2491f76ece.tar.gz frameworks_opt_telephony-61aa925f47e4d0970739855236d91b2491f76ece.tar.bz2 | |
Fix NRE on sending multipart texts.
Watch for deliveryIntents, parts, and sentIntents being null.
Change-Id: Ib9e55b59ef92d0f6057ec2e8c93dcb95d68a612d
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java b/src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java index 6d824ba..ed1ed3c 100644 --- a/src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java +++ b/src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java @@ -174,8 +174,10 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub { mContext.enforceCallingPermission( android.Manifest.permission.SEND_SMS, "Sending SMS message"); - broadcastOutgoingSms(destAddr, scAddr, true, new ArrayList<String>(parts), - new ArrayList<PendingIntent>(sentIntents), new ArrayList<PendingIntent>(deliveryIntents)); + broadcastOutgoingSms(destAddr, scAddr, true, + parts != null ? new ArrayList<String>(parts) : null, + sentIntents != null ? new ArrayList<PendingIntent>(sentIntents) : null, + deliveryIntents != null ? new ArrayList<PendingIntent>(deliveryIntents) : null); } public boolean enableCellBroadcast(int messageIdentifier) throws android.os.RemoteException { |