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

Commit 75418ebf authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Remove dummy subscription ids" am: 22d12411 

am: f7a5ef5c

Change-Id: Id0a69db7c6668770361b6df58eef8d1a082ceca4
parents beea2153 f7a5ef5c

config/hiddenapi-light-greylist.txt

+0 −1
Original line number Diff line number Diff line
@@ -3645,7 +3645,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
@@ -1407,8 +1407,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) {