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

Commit c4a355bd authored by sqian's avatar sqian Committed by Amit Mahajan
Browse files

Add Emergency Uniform Resources Names (URN) 

Test: Treehugger
Bug: 112657134
Change-Id: I85765502b5c941b4a15321edb47c3d0bdaf90c54
Merged-In: I85765502b5c941b4a15321edb47c3d0bdaf90c54
(cherry picked from commit f88db7c7)
parent 22f7e88f

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

+1 −0
Original line number Diff line number Diff line
@@ -966,6 +966,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            try {

                radioProxy14.emergencyDial(rr.mSerial, dialInfo,

                        emergencyNumberInfo.getEmergencyServiceCategoryBitmask(),

                        (ArrayList) emergencyNumberInfo.getEmergencyUrns(),

                        emergencyNumberInfo.getEmergencyCallRouting());

            } catch (RemoteException | RuntimeException e) {

                handleRadioProxyExceptionForRR(rr, "emergencyDial", e);

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

+2 −2
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ public class RadioIndication extends IRadioIndication.Stub { 
                : emergencyNumberList) {

            EmergencyNumber emergencyNumber = new EmergencyNumber(emergencyNumberHal.number,

                    MccTable.countryCodeForMcc(emergencyNumberHal.mcc), emergencyNumberHal.mnc,

                    emergencyNumberHal.categories, emergencyNumberHal.sources,

                    EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN);

                    emergencyNumberHal.categories, emergencyNumberHal.urns,

                    emergencyNumberHal.sources, EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN);

            response.add(emergencyNumber);

        }

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+5 −3
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ public class EmergencyNumberTracker extends Handler { 
            }

        }

        return new EmergencyNumber(phoneNumber, countryIso, "", emergencyServiceCategoryBitmask,

                EmergencyNumber.EMERGENCY_NUMBER_SOURCE_DATABASE,

                new ArrayList<String>(), EmergencyNumber.EMERGENCY_NUMBER_SOURCE_DATABASE,

                EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN);

    }
@@ -420,14 +420,16 @@ public class EmergencyNumberTracker extends Handler { 
            // return true if one is found.

            for (String emergencyNum : emergencyNumbers.split(",")) {

                emergencyNumberList.add(new EmergencyNumber(emergencyNum, "", "",

                        EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED, 0,

                        EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,

                        new ArrayList<String>(), 0,

                        EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN));

            }

        }

        emergencyNumbers = ((slotId < 0) ? "112,911,000,08,110,118,119,999" : "112,911");

        for (String emergencyNum : emergencyNumbers.split(",")) {

            emergencyNumberList.add(new EmergencyNumber(emergencyNum, "", "",

                    EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED, 0,

                    EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,

                    new ArrayList<String>(), 0,

                    EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN));

        }

        EmergencyNumber.mergeSameNumbersInEmergencyNumberList(emergencyNumberList);

tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTest.java

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ public class EmergencyNumberTest extends TestCase { 
                "us",

                "30",

                EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,

                new ArrayList<String>(),

                EmergencyNumber.EMERGENCY_NUMBER_SOURCE_NETWORK_SIGNALING,

                EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL);

        assertEquals(number.getNumber(), "911");
@@ -81,6 +82,7 @@ public class EmergencyNumberTest extends TestCase { 
                "us",

                "30",

                EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_MARINE_GUARD,

                new ArrayList<String>(),

                EmergencyNumber.EMERGENCY_NUMBER_SOURCE_NETWORK_SIGNALING

                        | EmergencyNumber.EMERGENCY_NUMBER_SOURCE_MODEM_CONFIG,

                EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL);
@@ -139,6 +141,7 @@ public class EmergencyNumberTest extends TestCase { 
                EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_POLICE

                        | EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_AMBULANCE

                        | EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_MIEC,

                new ArrayList<String>(),

                EmergencyNumber.EMERGENCY_NUMBER_SOURCE_NETWORK_SIGNALING

                        | EmergencyNumber.EMERGENCY_NUMBER_SOURCE_SIM

                        | EmergencyNumber.EMERGENCY_NUMBER_SOURCE_DEFAULT,
@@ -206,6 +209,7 @@ public class EmergencyNumberTest extends TestCase { 
                "us",

                "30",

                EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,

                new ArrayList<String>(),

                EmergencyNumber.EMERGENCY_NUMBER_SOURCE_NETWORK_SIGNALING,

                EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL);
@@ -216,6 +220,7 @@ public class EmergencyNumberTest extends TestCase { 
                EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_POLICE

                        | EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_AMBULANCE

                        | EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_MIEC,

                new ArrayList<String>(),

                EmergencyNumber.EMERGENCY_NUMBER_SOURCE_SIM,

                EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL);
@@ -226,6 +231,7 @@ public class EmergencyNumberTest extends TestCase { 
                EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_POLICE

                        | EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_AMBULANCE

                        | EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_MIEC,

                new ArrayList<String>(),

                EmergencyNumber.EMERGENCY_NUMBER_SOURCE_MODEM_CONFIG

                        | EmergencyNumber.EMERGENCY_NUMBER_SOURCE_DEFAULT,

                EmergencyNumber.EMERGENCY_CALL_ROUTING_NORMAL);

tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTrackerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ public class EmergencyNumberTrackerTest extends TelephonyTest { 
    private void initializeEmergencyNumberListTestSamples() {

        EmergencyNumber emergencyNumberForTest = new EmergencyNumber("119", "jp", "30",

                EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_FIRE_BRIGADE,

                new ArrayList<String>(),

                EmergencyNumber.EMERGENCY_NUMBER_SOURCE_NETWORK_SIGNALING,

                EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN);

        mEmergencyNumberListTestSample.add(emergencyNumberForTest);