Merge "Update getMergedSubscriberIds to pass subId" (f1aca7cf) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -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) {
		}

+11 −1

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