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

Merge "Update getMergedSubscriberIds to pass subId" into qt-dev am: 4f8ad9cb35

Browse Source 
am: e586fdea3f

Change-Id: I65cc2907e61d6c7dc55ecaaff188fbaa0d8db78e
This commit is contained in:
Jordan Liu
2019-05-10 02:29:02 -07:00
committed by android-build-merger
parent 049ee1d6ba e586fdea3f
commit d995ac5ccc
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3842,10 +3842,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
*/
@@ -3854,7 +3856,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) {
}

12
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -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.