From 61aa925f47e4d0970739855236d91b2491f76ece Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 24 Jul 2013 18:49:27 -0700
Subject: Fix NRE on sending multipart texts.

Watch for deliveryIntents, parts, and sentIntents being null.

Change-Id: Ib9e55b59ef92d0f6057ec2e8c93dcb95d68a612d
---
 .../com/android/internal/telephony/IccSmsInterfaceManagerProxy.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

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 {
-- 
cgit v1.1