Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 857c4cbf authored by Jordan Liu's avatar Jordan Liu
Browse files

Update getMergedSubscriberIds to pass subId 

Bug: 131189269
Test: manual
Merged-In: I0d237b646969442b71597e66c9cb491c02a144d3
Change-Id: I0d237b646969442b71597e66c9cb491c02a144d3
(cherry picked from commit 973a60d76ec29e7295237ef8b6670f81917b071b)
parent a0a72ec4

telephony/java/android/telephony/TelephonyManager.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -3783,10 +3783,12 @@ public class TelephonyManager { 
    }

    }





    /**

    /**

     * Return the set of subscriber IDs that should be considered as "merged

     * Return the set of subscriber IDs that should be considered "merged together" for data usage

     * together" for data usage purposes. This is commonly {@code null} to

     * purposes. This is commonly {@code null} to indicate no merging is required. Any returned

     * indicate no merging is required. Any returned subscribers are sorted in a

     * subscribers are sorted in a deterministic order.

     * deterministic order.

     * <p>

     * The returned set of subscriber IDs will include the subscriber ID corresponding to this

     * TelephonyManager's subId.

     *

     *

     * @hide

     * @hide

     */

     */
@@ -3795,7 +3797,7 @@ public class TelephonyManager { 
        try {

        try {

            ITelephony telephony = getITelephony();

            ITelephony telephony = getITelephony();

            if (telephony != null)

            if (telephony != null)

                return telephony.getMergedSubscriberIds(getOpPackageName());

                return telephony.getMergedSubscriberIds(getSubId(), getOpPackageName());

        } catch (RemoteException ex) {

        } catch (RemoteException ex) {

        } catch (NullPointerException ex) {

        } catch (NullPointerException ex) {

        }

        }

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

+11 −1
Original line number Original line Diff line number Diff line
@@ -1051,7 +1051,17 @@ interface ITelephony { 
     */

     */

    String getLine1AlphaTagForDisplay(int subId, String callingPackage);

    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.

     * Override the operator branding for the current ICCID.