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

Commit f3e1fc80 authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Add NonNull annotation to getAllSubscriptionInfoList" am: e5e23888... 

Merge "Add NonNull annotation to getAllSubscriptionInfoList" am: e5e23888 am: b6552594 am: 0c5a020a am: fa5490f9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1485142

Change-Id: I32c480fd6be64c9f40b0c3490ffa94ca5a585d1a
parents c6183933 fa5490f9

telephony/java/android/telephony/SubscriptionManager.java

+2 −1
Original line number Diff line number Diff line
@@ -1365,6 +1365,7 @@ public class SubscriptionManager { 
     * include those that were inserted before, maybe empty but not null.

     * @hide

     */

    @NonNull

    @UnsupportedAppUsage

    public List<SubscriptionInfo> getAllSubscriptionInfoList() {

        if (VDBG) logd("[getAllSubscriptionInfoList]+");
@@ -1382,7 +1383,7 @@ public class SubscriptionManager { 
        }



        if (result == null) {

            result = new ArrayList<>();

            result = Collections.emptyList();

        }

        return result;

    }