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

Commit 2f6ef53e authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Remove dummy subscription ids"

parents 8145a37a bfde48f4

config/hiddenapi-light-greylist.txt

+0 −1
Original line number Diff line number Diff line
@@ -3568,7 +3568,6 @@ Lcom/android/internal/telephony/SubscriptionController;->getDefaultDataSubId()I 
Lcom/android/internal/telephony/SubscriptionController;->getDefaultSmsSubId()I

Lcom/android/internal/telephony/SubscriptionController;->getDefaultSubId()I

Lcom/android/internal/telephony/SubscriptionController;->getDefaultVoiceSubId()I

Lcom/android/internal/telephony/SubscriptionController;->getDummySubIds(I)[I

Lcom/android/internal/telephony/SubscriptionController;->getInstance()Lcom/android/internal/telephony/SubscriptionController;

Lcom/android/internal/telephony/SubscriptionController;->getPhoneId(I)I

Lcom/android/internal/telephony/SubscriptionController;->getSubId(I)[I

telephony/java/android/telephony/SubscriptionManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1421,8 +1421,9 @@ public class SubscriptionManager { 


    /**

     * Get an array of Subscription Ids for specified slot Index.

     * @param slotIndex the slot Index.

     * @return subscription Ids or null if the given slot Index is not valid.

     * @param slotIndex the slot index.

     * @return subscription Ids or null if the given slot Index is not valid or there are no active

     * subscriptions in the slot.

     */

    @Nullable

    public static int[] getSubscriptionIds(int slotIndex) {