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

Commit 08bb1d62 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: 516a7d21 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17803170



Change-Id: I75b5a715d628d84522021931b4572820287fb107
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b37a470 516a7d21

src/java/com/android/internal/telephony/data/CellularDataService.java

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import com.android.internal.telephony.Phone; 
import com.android.internal.telephony.PhoneFactory;

import com.android.telephony.Rlog;



import java.util.Collections;

import java.util.HashMap;

import java.util.List;

import java.util.Map;
@@ -107,8 +108,8 @@ public class CellularDataService extends DataService { 
                                    ar.exception != null

                                            ? DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE

                                            : RESULT_SUCCESS,

                                    ar.exception != null

                                            ? null : (List<DataCallResponse>) ar.result

                                    ar.exception != null ? Collections.EMPTY_LIST

                                            : (List<DataCallResponse>) ar.result

                                    );

                            break;

                        case DATA_CALL_LIST_CHANGED: