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

Commit 602b2c2f authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Construct a ArrayList for emergency Urn" 

am: f9cdd07f

Change-Id: I21f9cc321a9965dff6e150f30d9f0a345c000677
parents 7cc9fc1b f9cdd07f

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

+3 −2
Original line number Diff line number Diff line
@@ -949,7 +949,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
                    uusInfo, result);

            return;

        }



        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            RILRequest rr = obtainRequest(RIL_REQUEST_DIAL, result,
@@ -1008,7 +1007,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            try {

                radioProxy14.emergencyDial(rr.mSerial, dialInfo,

                        emergencyNumberInfo.getEmergencyServiceCategoryBitmaskInternalDial(),

                        (ArrayList) emergencyNumberInfo.getEmergencyUrns(),

                        emergencyNumberInfo.getEmergencyUrns() != null

                                ? new ArrayList(emergencyNumberInfo.getEmergencyUrns())

                                : new ArrayList<>(),

                        emergencyNumberInfo.getEmergencyCallRouting(),

                        hasKnownUserIntentEmergency,

                        emergencyNumberInfo.getEmergencyNumberSourceBitmask()