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

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

Fix NPE on sending multipart texts. 

Watch for deliveryIntents, parts, and sentIntents being null.
Also do some code style cleanups.

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

Change-Id: I4abe2a2bd3e45bafde32de3a0c81576d742e4cee
parent db20c5e6

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

+2 −3
Original line number Diff line number Diff line
@@ -827,11 +827,10 @@ public class IccSmsInterfaceManager extends ISms.Stub { 


    /** @hide **/

    public boolean isShortSMSCode(String destAddr) {

        TelephonyManager telephonyManager;

        TelephonyManager telephonyManager =

                (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

        int smsCategory = SmsUsageMonitor.CATEGORY_NOT_SHORT_CODE;



        telephonyManager =(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);



        String countryIso = telephonyManager.getSimCountryIso();

        if (countryIso == null || countryIso.length() != 2) {

            countryIso = telephonyManager.getNetworkCountryIso();

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

+12 −6
Original line number Diff line number Diff line
@@ -48,8 +48,10 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub { 
            String scAddr = intent.getStringExtra("scAddr");

            String callingPackage = intent.getStringExtra("callingPackage");

            ArrayList<String> parts = intent.getStringArrayListExtra("parts");

            ArrayList<PendingIntent> sentIntents = intent.getParcelableArrayListExtra("sentIntents");

            ArrayList<PendingIntent> deliveryIntents = intent.getParcelableArrayListExtra("deliveryIntents");

            ArrayList<PendingIntent> sentIntents =

                    intent.getParcelableArrayListExtra("sentIntents");

            ArrayList<PendingIntent> deliveryIntents =

                    intent.getParcelableArrayListExtra("deliveryIntents");



            if (intent.getIntExtra("callingUid", 0) != 0) {

                callingPackage = callingPackage + "\\" + intent.getIntExtra("callingUid", 0);
@@ -126,12 +128,14 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub { 
                mHandler, Activity.RESULT_OK, null, null);

    }



    public void synthesizeMessages(String originatingAddress, String scAddress, List<String> messages, long timestampMillis) throws RemoteException {

    public void synthesizeMessages(String originatingAddress, String scAddress,

            List<String> messages, long timestampMillis) throws RemoteException {

        mContext.enforceCallingPermission(

                android.Manifest.permission.BROADCAST_SMS, "");

        byte[][] pdus = new byte[messages.size()][];

        for (int i = 0; i < messages.size(); i++) {

            SyntheticSmsMessage message = new SyntheticSmsMessage(originatingAddress, scAddress, messages.get(i), timestampMillis);

            SyntheticSmsMessage message = new SyntheticSmsMessage(originatingAddress,

                    scAddress, messages.get(i), timestampMillis);

            pdus[i] = message.getPdu();

        }

        dispatchPdus(pdus);
@@ -213,8 +217,10 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub { 
                    parts, sentIntents, deliveryIntents);

            return;

        }

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

    }