Merge "Don't send null data call list response" into tm-dev am: 174c5ebb78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17803433 Change-Id: I8fb44223f01dbb000783f731590863b454c71ef6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -41,6 +41,7 @@ import com.android.telephony.Rlog;
|
|||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
import java.lang.annotation.RetentionPolicy;
|
import java.lang.annotation.RetentionPolicy;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -351,7 +352,7 @@ public abstract class DataService extends Service {
|
|||||||
public void requestDataCallList(@NonNull DataServiceCallback callback) {
|
public void requestDataCallList(@NonNull DataServiceCallback callback) {
|
||||||
// The default implementation is to return unsupported.
|
// The default implementation is to return unsupported.
|
||||||
callback.onRequestDataCallListComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED,
|
callback.onRequestDataCallListComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED,
|
||||||
null);
|
Collections.EMPTY_LIST);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void registerForDataCallListChanged(IDataServiceCallback callback) {
|
private void registerForDataCallListChanged(IDataServiceCallback callback) {
|
||||||
|
|||||||
Reference in New Issue
Block a user