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

Commit d9bd0f8a authored by sqian's avatar sqian Committed by Shuo Qian
Browse files

Construct a ArrayList for emergency Urn 

- prevent it casting from a List that may not be a ArrayList

Test: Manual; Treehugger
Bug: 134619022
Change-Id: I3857e9cb73684df2c110a5bcc06d1c845b810ee4
parent 0e3e1178

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

+3 −2
Original line number Diff line number Diff line
@@ -974,7 +974,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,
@@ -1033,7 +1032,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()