From afc39ef1aed29b9168420c277044d112360dffb5 Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Mon, 18 Apr 2022 11:56:50 -0700
Subject: [PATCH] Don't send null data call list response

Test: atest DataServiceCallbackTest
Bug: 223473056
Change-Id: I2919fff4abe1ccc234ae2b5d45582eadce440986
---
 telephony/java/android/telephony/data/DataService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/data/DataService.java b/telephony/java/android/telephony/data/DataService.java
index bd346d516a1d6..700d61597d00e 100644
--- a/telephony/java/android/telephony/data/DataService.java
+++ b/telephony/java/android/telephony/data/DataService.java
@@ -41,6 +41,7 @@ import com.android.telephony.Rlog;
 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 abstract class DataService extends Service {
         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) {