Merge "Try to label emergency number in ril.ecclist" (08024bc3) · Commits · e / os / android_frameworks_opt_telephony

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

+17 −8

Original line number	Diff line number	Diff line
		@@ -467,18 +467,12 @@ public class EmergencyNumberTracker extends Handler {
		// searches through the comma-separated list for a match,
		// return true if one is found.
		for (String emergencyNum : emergencyNumbers.split(",")) {
		emergencyNumberList.add(new EmergencyNumber(emergencyNum, "", "",
		EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,
		new ArrayList<String>(), 0,
		EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN));
		emergencyNumberList.add(getLabeledEmergencyNumberForEcclist(emergencyNum));
		}
		}
		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,
		new ArrayList<String>(), 0,
		EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN));
		emergencyNumberList.add(getLabeledEmergencyNumberForEcclist(emergencyNum));
		}
		EmergencyNumber.mergeSameNumbersInEmergencyNumberList(emergencyNumberList);
		return emergencyNumberList;
		@@ -493,6 +487,21 @@ public class EmergencyNumberTracker extends Handler {
		return false;
		}

		private EmergencyNumber getLabeledEmergencyNumberForEcclist(String number) {
		for (EmergencyNumber num : mEmergencyNumberListFromDatabase) {
		if (num.getNumber().equals(number)) {
		return new EmergencyNumber(number, mCountryIso.toLowerCase(), "",
		num.getEmergencyServiceCategoryBitmask(),
		new ArrayList<String>(), EmergencyNumber.EMERGENCY_NUMBER_SOURCE_DATABASE,
		EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN);
		}
		}
		return new EmergencyNumber(number, "", "",
		EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED,
		new ArrayList<String>(), 0,
		EmergencyNumber.EMERGENCY_CALL_ROUTING_UNKNOWN);
		}

		/**
		* Back-up old logics for {@link PhoneNumberUtils#isEmergencyNumberInternal} for legacy
		* and deprecate purpose.