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

Commit 05d32948 authored by Sarah Chin's avatar Sarah Chin Committed by Jack Yu
Browse files

Don't send null data call list response 

Test: atest DataServiceCallbackTest
Bug: 223473056
Merged-In: I5d04be5d4c2b7a119ba1852f90af2a24aa85ab27
Change-Id: I5d04be5d4c2b7a119ba1852f90af2a24aa85ab27
parent 796f38cb

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

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

import com.android.internal.telephony.PhoneFactory;

import com.android.telephony.Rlog;

import com.android.telephony.Rlog;





import java.util.Collections;

import java.util.HashMap;

import java.util.HashMap;

import java.util.List;

import java.util.List;

import java.util.Map;

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

                                    ar.exception != null

                                            ? DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE

                                            ? DataServiceCallback.RESULT_ERROR_ILLEGAL_STATE

                                            : RESULT_SUCCESS,

                                            : RESULT_SUCCESS,

                                    ar.exception != null

                                    ar.exception != null ? Collections.EMPTY_LIST

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

                                            : (List<DataCallResponse>) ar.result

                                    );

                                    );

                            break;

                            break;

                        case DATA_CALL_LIST_CHANGED:

                        case DATA_CALL_LIST_CHANGED: