diff options
author | yanxue.xu <yanxue.xu@spreadtrum.com> | 2017-07-13 16:40:55 +0800 |
---|---|---|
committer | yanxue xu <yanxue.xu@spreadtrum.com> | 2017-08-09 14:58:25 +0800 |
commit | 9957f979e14ba7b1e12326f36e8d47351bdf816a (patch) | |
tree | 530eab1184bd613b7c5abbb2c3f9f08e593f11f0 | |
parent | 973ddd55eb1cade522d10da03932eb43aec0e764 (diff) | |
download | base-9957f979e14ba7b1e12326f36e8d47351bdf816a.tar.gz |
Get isim card data use subId.
Get isim card data is obtained the default card data instead of the corresponding card data.
It is necessary to obtain the card data according to the subid.
Test: Get isim card data use subId.
Change-Id: I9ad90f8180f35449879507b6f086c4be01aacc9d
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 15 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl | 10 |
2 files changed, 15 insertions, 10 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index add4f03cddb1..769894fa7680 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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) { diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl index dbd8867b14c9..0f3182136997 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl @@ -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. |