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

Commit 00a74e52 authored Jul 24, 2014 by ram Committed by Android Git Automerger Jul 24, 2014

am 77df30af: am 78609909: IMS: getPCSCF() API enhanced to support multiple APN types.

* commit '77df30af77746b231d9d6828dfb0897f36e31773':
  IMS: getPCSCF() API enhanced to support multiple APN types.

parents dc9d7524 3f67998e

telephony/java/android/telephony/TelephonyManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -2789,13 +2789,13 @@ public class TelephonyManager {

		/**
		* Get P-CSCF address from PCO after data connection is established or modified.
		*
		* @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN
		* @return array of P-CSCF address
		* @hide
		*/
		public String[] getPcscfAddress() {
		public String[] getPcscfAddress(String apnType) {
		try {
		return getITelephony().getPcscfAddress();
		return getITelephony().getPcscfAddress(apnType);
		} catch (RemoteException e) {
		return new String[0];
		}

telephony/java/com/android/internal/telephony/ITelephony.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -634,8 +634,9 @@ interface ITelephony {

		/**
		* Get P-CSCF address from PCO after data connection is established or modified.
		* @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN
		*/
		String[] getPcscfAddress();
		String[] getPcscfAddress(String apnType);

		/**
		* Set IMS registration state