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

Commit 93b95bf6 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

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

am: 923bbad6

Change-Id: I8369201f38bdb9e288901c53e25b38bbb195faf7
parents 9932eb7e 923bbad6

telephony/java/android/telephony/SubscriptionManager.java

+2 −1
Original line number Diff line number Diff line
@@ -2233,9 +2233,10 @@ public class SubscriptionManager { 
     *  Provide all available user downloaded profiles on phone which are used only for

     *  opportunistic data.

     *  @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)

    public List<SubscriptionInfo> getOpportunisticSubscriptions(int slotIndex) {

    public @NonNull List<SubscriptionInfo> getOpportunisticSubscriptions(int slotIndex) {

        String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>";

        List<SubscriptionInfo> subInfoList = null;