Merge "Get isim card data use subId." (3466cda3) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -3221,7 +3221,8 @@ public class TelephonyManager {
	IPhoneSubInfo info = getSubscriberInfo();		IPhoneSubInfo info = getSubscriberInfo();
	if (info == null)		if (info == null)
	return null;		return null;
	return info.getIsimImpi();		//get the Isim Impi based on subId
			return info.getIsimImpi(getSubId());
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	return null;		return null;
	} catch (NullPointerException ex) {		} catch (NullPointerException ex) {
	@@ -3240,7 +3241,8 @@ public class TelephonyManager {
	IPhoneSubInfo info = getSubscriberInfo();		IPhoneSubInfo info = getSubscriberInfo();
	if (info == null)		if (info == null)
	return null;		return null;
	return info.getIsimDomain();		//get the Isim Domain based on subId
			return info.getIsimDomain(getSubId());
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	return null;		return null;
	} catch (NullPointerException ex) {		} catch (NullPointerException ex) {
	@@ -3260,7 +3262,8 @@ public class TelephonyManager {
	IPhoneSubInfo info = getSubscriberInfo();		IPhoneSubInfo info = getSubscriberInfo();
	if (info == null)		if (info == null)
	return null;		return null;
	return info.getIsimImpu();		//get the Isim Impu based on subId
			return info.getIsimImpu(getSubId());
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	return null;		return null;
	} catch (NullPointerException ex) {		} catch (NullPointerException ex) {
	@@ -4373,7 +4376,8 @@ public class TelephonyManager {
	IPhoneSubInfo info = getSubscriberInfo();		IPhoneSubInfo info = getSubscriberInfo();
	if (info == null)		if (info == null)
	return null;		return null;
	return info.getIsimIst();		//get the Isim Ist based on subId
			return info.getIsimIst(getSubId());
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	return null;		return null;
	} catch (NullPointerException ex) {		} catch (NullPointerException ex) {
	@@ -4393,7 +4397,8 @@ public class TelephonyManager {
	IPhoneSubInfo info = getSubscriberInfo();		IPhoneSubInfo info = getSubscriberInfo();
	if (info == null)		if (info == null)
	return null;		return null;
	return info.getIsimPcscf();		//get the Isim Pcscf based on subId
			return info.getIsimPcscf(getSubId());
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	return null;		return null;
	} catch (NullPointerException ex) {		} catch (NullPointerException ex) {

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -166,33 +166,33 @@ interface IPhoneSubInfo {
	* Returns the IMS private user identity (IMPI) that was loaded from the ISIM.		* Returns the IMS private user identity (IMPI) that was loaded from the ISIM.
	* @return the IMPI, or null if not present or not loaded		* @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.		* 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		* @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.		* 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		* @return an array of IMPU strings, with one IMPU per string, or null if
	* not present or not loaded		* not present or not loaded
	*/		*/
	String[] getIsimImpu();		String[] getIsimImpu(int subId);

	/**		/**
	* Returns the IMS Service Table (IST) that was loaded from the ISIM.		* Returns the IMS Service Table (IST) that was loaded from the ISIM.
	* @return IMS Service Table or null if not present or not loaded		* @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.		* 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		* @return an array of PCSCF strings with one PCSCF per string, or null if
	* not present or not loaded		* not present or not loaded
	*/		*/
	String[] getIsimPcscf();		String[] getIsimPcscf(int subId);

	/**		/**
	* TODO: Deprecate and remove this interface. Superceded by getIccsimChallengeResponse.		* TODO: Deprecate and remove this interface. Superceded by getIccsimChallengeResponse.