commit e647099e14114475e9a2827a10dab2d2e36308c4
author ram <ram.pl@samsung.com> Fri Jul 18 17:38:15 2014 +0530
committer Etan Cohen <etancohen@google.com> Thu Jul 24 00:41:00 2014 +0000
tree b044b3974861175ac3ed1cb8eb999ee1c3fe9200
parent 1bc61376f51dd976c69a73e1cf6b8f334188e478

IMS: getPCSCF() API enhanced to support multiple APN types.

Change-Id: I014f341b93a9ea7280e04cdfc13418fe81c9fc8b
Signed-off-by: ram <ram.pl@samsung.com>

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 2555874..39bbf72 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2789,13 +2789,13 @@
 
     /**
      * 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

diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index ec7b8ae..8c37e3d 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -634,8 +634,9 @@
 
     /**
      * 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