Merge "Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am:... (eacbe710) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -3253,7 +3253,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) {
		@@ -3272,7 +3273,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) {
		@@ -3292,7 +3294,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) {
		@@ -4405,7 +4408,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) {
		@@ -4425,7 +4429,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) {

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -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.