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

Commit 9e6cfe82 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE for CdmaSmsMessage initialization" into tm-dev am: c54fadb9 

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



Change-Id: I428415d0d7cacc204dd659cf0fbfb054d4daf7a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9294dc49 c54fadb9

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

+2 −0
Original line number Diff line number Diff line
@@ -636,6 +636,8 @@ public class RILUtils { 
            byte[] pdu) {

        android.hardware.radio.messaging.CdmaSmsMessage msg =

                new android.hardware.radio.messaging.CdmaSmsMessage();

        msg.address = new android.hardware.radio.messaging.CdmaSmsAddress();

        msg.subAddress = new android.hardware.radio.messaging.CdmaSmsSubaddress();

        int addrNbrOfDigits;

        int subaddrNbrOfDigits;

        int bearerDataLength;