Merge "Integrate Emergency Number everywhere" (b0df2c17) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.telephony.ServiceState;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.telephony.data.ApnSetting;
		import android.telephony.emergency.EmergencyNumber;

		import java.util.List;

		@@ -364,12 +363,10 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		}

		@Override
		public void notifyEmergencyNumberList(Phone sender,
		List<EmergencyNumber> emergencyNumberList) {
		int subId = sender.getSubId();
		public void notifyEmergencyNumberList() {
		try {
		if (mRegistry != null) {
		mRegistry.notifyEmergencyNumberList(emergencyNumberList);
		mRegistry.notifyEmergencyNumberList();
		}
		} catch (RemoteException ex) {
		// system process is dead

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -402,6 +402,16 @@ public class LocaleTracker extends Handler {
		mLocalLog.log(msg);
		mCurrentCountryIso = countryIso;

		// Inform EmergencyNumberTrack with the change of current Country ISO
		if (mPhone != null && mPhone.getEmergencyNumberTracker() != null) {
		mPhone.getEmergencyNumberTracker().updateEmergencyNumberDatabaseCountryChange(
		getCurrentCountry());
		log("Notified EmergencyNumberTracker");
		} else {
		loge("Cannot notify EmergencyNumberTracker. Phone is null? "
		+ Boolean.toString(mPhone == null));
		}

		TelephonyManager.setTelephonyProperty(mPhone.getPhoneId(),
		TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, mCurrentCountryIso);

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -2255,9 +2255,9 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		mNotifier.notifySrvccStateChanged(this, state);
		}

		/** Notify the list of {@link EmergencyNumber} changes. */
		public void notifyEmergencyNumberList(List<EmergencyNumber> emergencyNumberList) {
		mNotifier.notifyEmergencyNumberList(this, emergencyNumberList);
		/** Notify the {@link EmergencyNumber} changes. */
		public void notifyEmergencyNumberList() {
		mNotifier.notifyEmergencyNumberList();
		}

		/**

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.telephony.CellLocation;
		import android.telephony.PhoneCapability;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.TelephonyManager;
		import android.telephony.emergency.EmergencyNumber;

		import java.util.List;

		@@ -81,5 +80,5 @@ public interface PhoneNotifier {
		void notifyRadioPowerStateChanged(@TelephonyManager.RadioPowerState int state);

		/** Notify of change to EmergencyNumberList. */
		void notifyEmergencyNumberList(Phone sender, List<EmergencyNumber> emergencyNumberList);
		void notifyEmergencyNumberList();
		}

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

+23 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CDMA_RUIM_SM
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_CELL_INFO_LIST;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_DATA_CALL_LIST_CHANGED;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_EMERGENCY_NUMBER_LIST;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_ENTER_EMERGENCY_CALLBACK_MODE;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE;
		import static com.android.internal.telephony.RILConstants.RIL_UNSOL_HARDWARE_CONFIG_CHANGED;
		@@ -94,6 +95,7 @@ import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.SmsMessage;
		import android.telephony.TelephonyManager;
		import android.telephony.emergency.EmergencyNumber;

		import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
		import com.android.internal.telephony.cdma.CdmaInformationRecords;
		@@ -290,6 +292,27 @@ public class RadioIndication extends IRadioIndication.Stub {
		physicalChannelConfigsIndication(configs);
		}

		/**
		* Indicates current emergency number list.
		*/
		public void currentEmergencyNumberList(int indicationType,
		ArrayList<android.hardware.radio.V1_4.EmergencyNumber> emergencyNumberList) {
		List<EmergencyNumber> response = new ArrayList<>(emergencyNumberList.size());

		for (android.hardware.radio.V1_4.EmergencyNumber emergencyNumberHal
		: emergencyNumberList) {
		EmergencyNumber emergencyNumber = new EmergencyNumber(emergencyNumberHal.number,
		MccTable.countryCodeForMcc(emergencyNumberHal.mcc), emergencyNumberHal.mnc,
		emergencyNumberHal.categories, emergencyNumberHal.sources);
		response.add(emergencyNumber);
		}

		if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_EMERGENCY_NUMBER_LIST, response);

		mRil.mEmergencyNumberListRegistrants.notifyRegistrants(
		new AsyncResult(null, response, null));
		}

		public void dataCallListChanged(int indicationType, ArrayList<SetupDataCallResult> dcList) {
		mRil.processIndication(indicationType);