commit 50b8df99a7dcdd5d7eb69ef3aff3dc8667b39196
author Sarah Chin <sarahchin@google.com> Mon Apr 18 11:56:50 2022 -0700
committer Jack Yu <jackyu@google.com> Fri May 06 14:54:59 2022 -0700
tree 1a3a5c04c4300bf9750b1bcc968ddb97deef03c9
parent 1e3e69212a379e3dacc38e250713063bc5a21a21

Don't send null data call list response

Test: atest DataServiceCallbackTest
Bug: 223473056
Merged-In: I2919fff4abe1ccc234ae2b5d45582eadce440986
Change-Id: I2919fff4abe1ccc234ae2b5d45582eadce440986

telephony/java/android/telephony/data/DataService.java

diff --git a/telephony/java/android/telephony/data/DataService.java b/telephony/java/android/telephony/data/DataService.java
index bd346d5..700d615 100644
--- a/telephony/java/android/telephony/data/DataService.java
+++ b/telephony/java/android/telephony/data/DataService.java
@@ -41,6 +41,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -351,7 +352,7 @@
         public void requestDataCallList(@NonNull DataServiceCallback callback) {
             // The default implementation is to return unsupported.
             callback.onRequestDataCallListComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED,
-                    null);
+                    Collections.EMPTY_LIST);
         }
 
         private void registerForDataCallListChanged(IDataServiceCallback callback) {