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

Commit 061b2f76 authored by Benedict Wong's avatar Benedict Wong
Browse files

Add NonNull annotation to getAllSubscriptionInfoList 

This change marks getAllSubscriptionInfoList as NonNull; the method
already catches all exceptions, and returns an empty ArrayList if
something failed.

Test: atest FrameworksTelephonyTest
Change-Id: I7799d05f0f1f249fa5f4a47a3f4ff2c2691c75dc
parent 04c894b6

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;

    }