Merge "Add NonNull annotation to getAllSubscriptionInfoList" am: e5e2388844 am: b655259440 am: 0c5a020adc

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

Change-Id: Iecf37cc98db520445607fdc20efbac0bf21e10e2

1 files changed, 2 insertions, 1 deletions

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 7f87019dbbe2..83e63ef29e2c 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -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;
     }