Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d368879b authored by Jed Hamilton's avatar Jed Hamilton Committed by Danny Baumann
Browse files

Fix NRE on sending multipart texts. 

Watch for deliveryIntents, parts, and sentIntents being null.

This is based on http://review.cyanogenmod.org/#/c/46009/

Change-Id: I4abe2a2bd3e45bafde32de3a0c81576d742e4cee
parent 9ed9db55

src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java

+4 −2
Original line number Diff line number Diff line
@@ -196,8 +196,10 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub { 
        mContext.enforceCallingPermission(

                android.Manifest.permission.SEND_SMS,

                "Sending SMS message");

        broadcastOutgoingSms(callingPackage, destAddr, scAddr, true, new ArrayList<String>(parts),

                new ArrayList<PendingIntent>(sentIntents), new ArrayList<PendingIntent>(deliveryIntents),

        broadcastOutgoingSms(callingPackage, destAddr, scAddr, true,

                parts != null ? new ArrayList<String>(parts) : null,

                sentIntents != null ? new ArrayList<PendingIntent>(sentIntents) : null,

                deliveryIntents != null ?  new ArrayList<PendingIntent>(deliveryIntents) : null,

                -1);

    }