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

Commit 3e8bd26e authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Don't send null data call list response" into tm-dev am: 174c5ebb 

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



Change-Id: Idd6b1f25670968b2884a296d6bf98242c089ad52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 259afd66 174c5ebb

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

+2 −1
Original line number Diff line number Diff line
@@ -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) {