Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dummy subscription ids"

Browse Source 
am: 22d12411fd

Change-Id: I107462d3037bc0ced691ceaf3aa625ca2434dd1c
This commit is contained in:
Shuo Qian
2018-11-19 14:11:16 -08:00
committed by android-build-merger
parent 833a491fab 22d12411fd
commit f7a5ef5caa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/hiddenapi-light-greylist.txt
View File

@@ -3645,7 +3645,6 @@ Lcom/android/internal/telephony/SubscriptionController;->getDefaultDataSubId()I
Lcom/android/internal/telephony/SubscriptionController;->getDefaultSmsSubId()I Lcom/android/internal/telephony/SubscriptionController;->getDefaultSmsSubId()I
Lcom/android/internal/telephony/SubscriptionController;->getDefaultSubId()I Lcom/android/internal/telephony/SubscriptionController;->getDefaultSubId()I
Lcom/android/internal/telephony/SubscriptionController;->getDefaultVoiceSubId()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;->getInstance()Lcom/android/internal/telephony/SubscriptionController;
Lcom/android/internal/telephony/SubscriptionController;->getPhoneId(I)I Lcom/android/internal/telephony/SubscriptionController;->getPhoneId(I)I
Lcom/android/internal/telephony/SubscriptionController;->getSubId(I)[I Lcom/android/internal/telephony/SubscriptionController;->getSubId(I)[I

5
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -1407,8 +1407,9 @@ public class SubscriptionManager {
/** /**
* Get an array of Subscription Ids for specified slot Index. * Get an array of Subscription Ids for specified slot Index.
* @param slotIndex the slot Index. * @param slotIndex the slot index.
* @return subscription Ids or null if the given slot Index is not valid. * @return subscription Ids or null if the given slot Index is not valid or there are no active
* subscriptions in the slot.
*/ */
@Nullable @Nullable
public static int[] getSubscriptionIds(int slotIndex) { public static int[] getSubscriptionIds(int slotIndex) {