From 91412858b70721252f45442ef1cd4215a201d094 Mon Sep 17 00:00:00 2001 From: sqian Date: Fri, 9 Nov 2018 14:52:25 -0800 Subject: [PATCH] Remove dummy subscription ids Test: Treehugger Bug: 119144366 Change-Id: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e Merged-In: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e (cherry picked from commit bfde48f4ed4958251d28e695a39ce88f10f3542f) --- config/hiddenapi-light-greylist.txt | 1 - telephony/java/android/telephony/SubscriptionManager.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 374a336dccefc..27133893d5431 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -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 diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 80ee9b393f4df..93a062299be18 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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) {