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

Merge "Add NonNull annotation to getAllSubscriptionInfoList" am: e5e2388844

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

Change-Id: I70f81584da85defea3d71d97c3a363af5b32f72d
This commit is contained in:
Benedict Wong
2020-11-04 19:06:42 +00:00
committed by Automerger Merge Worker
parent 7ff2eff0fa e5e2388844
commit b655259440
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

@@ -1365,6 +1365,7 @@ public class SubscriptionManager {
* include those that were inserted before, maybe empty but not null. * include those that were inserted before, maybe empty but not null.
* @hide * @hide
*/ */
@NonNull
@UnsupportedAppUsage @UnsupportedAppUsage
public List<SubscriptionInfo> getAllSubscriptionInfoList() { public List<SubscriptionInfo> getAllSubscriptionInfoList() {
if (VDBG) logd("[getAllSubscriptionInfoList]+"); if (VDBG) logd("[getAllSubscriptionInfoList]+");
@@ -1382,7 +1383,7 @@ public class SubscriptionManager {
} }
if (result == null) { if (result == null) {
result = new ArrayList<>(); result = Collections.emptyList();
} }
return result; return result;
} }