diff options
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 12 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 510e7c9f864f..75a7013730cb 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3783,10 +3783,12 @@ public class TelephonyManager { } /** - * Return the set of subscriber IDs that should be considered as "merged - * together" for data usage purposes. This is commonly {@code null} to - * indicate no merging is required. Any returned subscribers are sorted in a - * deterministic order. + * Return the set of subscriber IDs that should be considered "merged together" for data usage + * purposes. This is commonly {@code null} to indicate no merging is required. Any returned + * subscribers are sorted in a deterministic order. + * <p> + * The returned set of subscriber IDs will include the subscriber ID corresponding to this + * TelephonyManager's subId. * * @hide */ @@ -3795,7 +3797,7 @@ public class TelephonyManager { try { ITelephony telephony = getITelephony(); if (telephony != null) - return telephony.getMergedSubscriberIds(getOpPackageName()); + return telephony.getMergedSubscriberIds(getSubId(), getOpPackageName()); } catch (RemoteException ex) { } catch (NullPointerException ex) { } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 71ea881fbf5d..634d3c62e173 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -1051,7 +1051,17 @@ interface ITelephony { */ String getLine1AlphaTagForDisplay(int subId, String callingPackage); - String[] getMergedSubscriberIds(String callingPackage); + /** + * Return the set of subscriber IDs that should be considered "merged together" for data usage + * purposes. This is commonly {@code null} to indicate no merging is required. Any returned + * subscribers are sorted in a deterministic order. + * <p> + * The returned set of subscriber IDs will include the subscriber ID corresponding to this + * TelephonyManager's subId. + * + * @hide + */ + String[] getMergedSubscriberIds(int subId, String callingPackage); /** * Override the operator branding for the current ICCID. |