Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Get isim card data use subId."

Browse Source
This commit is contained in:
Amit Mahajan
2017-08-10 15:57:38 +00:00
committed by Gerrit Code Review
parent 4263a5ed58 9957f979e1
commit 854edcff16
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3184,7 +3184,8 @@ public class TelephonyManager {
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
return info.getIsimImpi();
//get the Isim Impi based on subId
return info.getIsimImpi(getSubId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -3203,7 +3204,8 @@ public class TelephonyManager {
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
return info.getIsimDomain();
//get the Isim Domain based on subId
return info.getIsimDomain(getSubId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -3223,7 +3225,8 @@ public class TelephonyManager {
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
return info.getIsimImpu();
//get the Isim Impu based on subId
return info.getIsimImpu(getSubId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4352,7 +4355,8 @@ public class TelephonyManager {
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
return info.getIsimIst();
//get the Isim Ist based on subId
return info.getIsimIst(getSubId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
@@ -4372,7 +4376,8 @@ public class TelephonyManager {
IPhoneSubInfo info = getSubscriberInfo();
if (info == null)
return null;
return info.getIsimPcscf();
//get the Isim Pcscf based on subId
return info.getIsimPcscf(getSubId());
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {

10
telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
View File

@@ -166,33 +166,33 @@ interface IPhoneSubInfo {
* Returns the IMS private user identity (IMPI) that was loaded from the ISIM.
* @return the IMPI, or null if not present or not loaded
*/
String getIsimImpi();
String getIsimImpi(int subId);
/**
* Returns the IMS home network domain name that was loaded from the ISIM.
* @return the IMS domain name, or null if not present or not loaded
*/
String getIsimDomain();
String getIsimDomain(int subId);
/**
* Returns the IMS public user identities (IMPU) that were loaded from the ISIM.
* @return an array of IMPU strings, with one IMPU per string, or null if
* not present or not loaded
*/
String[] getIsimImpu();
String[] getIsimImpu(int subId);
/**
* Returns the IMS Service Table (IST) that was loaded from the ISIM.
* @return IMS Service Table or null if not present or not loaded
*/
String getIsimIst();
String getIsimIst(int subId);
/**
* Returns the IMS Proxy Call Session Control Function(PCSCF) that were loaded from the ISIM.
* @return an array of PCSCF strings with one PCSCF per string, or null if
* not present or not loaded
*/
String[] getIsimPcscf();
String[] getIsimPcscf(int subId);
/**
* TODO: Deprecate and remove this interface. Superceded by getIccsimChallengeResponse.