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

Merge "Add @NonNull in SubMgr#getOpportunisticSubscriptions return value."

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2018-10-26 01:30:21 +00:00
committed by Gerrit Code Review
parent 4d3f84fddb 9cfff6c90a
commit 923bbad67a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2233,9 +2233,10 @@ public class SubscriptionManager {
* Provide all available user downloaded profiles on phone which are used only for * Provide all available user downloaded profiles on phone which are used only for
* opportunistic data. * opportunistic data.
* @param slotIndex slot on which the profiles are queried from. * @param slotIndex slot on which the profiles are queried from.
* @return the list of opportunistic subscription info. If none exists, an empty list.
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
public List<SubscriptionInfo> getOpportunisticSubscriptions(int slotIndex) { public @NonNull List<SubscriptionInfo> getOpportunisticSubscriptions(int slotIndex) {
String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>"; String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";
List<SubscriptionInfo> subInfoList = null; List<SubscriptionInfo> subInfoList = null;