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

Commit 17c8654c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't send null data call list response" am: 22a9bec5 

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



Change-Id: Ic5cfb7ff25e9c330b2deceabb241802c2bcb3e62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29eb7ad1 22a9bec5

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) {