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

Commit 09f25365 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use createFromPdu() in common" am: d55f4647 am: 53cad68e am:... 

Merge "Use createFromPdu() in common" am: d55f4647 am: 53cad68e am: fb162c94 am: 8db72fcd am: c308377e

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1359243

Change-Id: I9cc843c569617c4104bd319b20dfcf003e9945e9
parents 247069e6 c308377e

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -166,9 +166,10 @@ public class RadioIndication extends IRadioIndication.Stub { 
        byte[] pduArray = RIL.arrayListToPrimitiveArray(pdu);

        byte[] pduArray = RIL.arrayListToPrimitiveArray(pdu);

        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS);

        if (RIL.RILJ_LOGD) mRil.unsljLog(RIL_UNSOL_RESPONSE_NEW_SMS);





        SmsMessage sms = SmsMessage.newFromCMT(pduArray);

        SmsMessageBase smsb = com.android.internal.telephony.gsm.SmsMessage.createFromPdu(pduArray);

        if (mRil.mGsmSmsRegistrant != null) {

        if (mRil.mGsmSmsRegistrant != null) {

            mRil.mGsmSmsRegistrant.notifyRegistrant(new AsyncResult(null, sms, null));

            mRil.mGsmSmsRegistrant.notifyRegistrant(

                    new AsyncResult(null, smsb == null ? null : new SmsMessage(smsb), null));

        }

        }

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -828,7 +828,7 @@ public class SmsDispatchersController extends Handler { 
    private Pair<Boolean, Boolean> handleGsmStatusReport(SMSDispatcher.SmsTracker tracker,

    private Pair<Boolean, Boolean> handleGsmStatusReport(SMSDispatcher.SmsTracker tracker,

            String format, byte[] pdu) {

            String format, byte[] pdu) {

        com.android.internal.telephony.gsm.SmsMessage sms =

        com.android.internal.telephony.gsm.SmsMessage sms =

                com.android.internal.telephony.gsm.SmsMessage.newFromCDS(pdu);

                com.android.internal.telephony.gsm.SmsMessage.createFromPdu(pdu);

        boolean complete = false;

        boolean complete = false;

        boolean success = false;

        boolean success = false;

        if (sms != null) {

        if (sms != null) {

src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -132,15 +132,15 @@ public final class GsmSMSDispatcher extends SMSDispatcher { 
    }

    }





    /**

    /**

     * Called when a status report is received.  This should correspond to

     * Called when a status report is received. This should correspond to a previously successful

     * a previously successful SEND.

     * SEND.

     *

     *

     * @param ar AsyncResult passed into the message handler.  ar.result should

     * @param ar AsyncResult passed into the message handler. ar.result should be a byte array for

     *           be a String representing the status report PDU, as ASCII hex.

     *           the status report PDU.

     */

     */

    private void handleStatusReport(AsyncResult ar) {

    private void handleStatusReport(AsyncResult ar) {

        byte[] pdu = (byte[]) ar.result;

        byte[] pdu = (byte[]) ar.result;

        SmsMessage sms = SmsMessage.newFromCDS(pdu);

        SmsMessage sms = SmsMessage.createFromPdu(pdu);

        boolean handled = false;

        boolean handled = false;





        if (sms != null) {

        if (sms != null) {

tests/telephonytests/src/android/telephony/SmsMessageTest.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,6 +31,5 @@ public class SmsMessageTest { 
        assertEquals(null, SmsMessage.createFromPdu(null, SmsConstants.FORMAT_3GPP2));

        assertEquals(null, SmsMessage.createFromPdu(null, SmsConstants.FORMAT_3GPP2));

        assertEquals(null, SmsMessage.createFromPdu(null, SmsConstants.FORMAT_3GPP));

        assertEquals(null, SmsMessage.createFromPdu(null, SmsConstants.FORMAT_3GPP));

        assertEquals(null, SmsMessage.createFromPdu(null));

        assertEquals(null, SmsMessage.createFromPdu(null));

        assertEquals(null, SmsMessage.newFromCMT(null));

    }

    }

}
 
}