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

Commit 257425c8 authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "Remove hidden API CollectionUtils.isEmpty" am: b5055d4c 

am: 48081ed5

Change-Id: Ie92f1d8209acc34861918588e977fb3a2c134007
parents 246ad34e 48081ed5

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+1 −3
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ import com.android.internal.telephony.dataconnection.DcTracker.RequestNetworkTyp 
import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.telephony.nano.TelephonyProto.RilDataCall;

import com.android.internal.util.AsyncChannel;

import com.android.internal.util.CollectionUtils;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Protocol;

import com.android.internal.util.State;
@@ -709,8 +708,7 @@ public class DataConnection extends StateMachine { 
            }



            linkProperties = dc.getLinkProperties();

            if (linkProperties == null || CollectionUtils.isEmpty(

                    linkProperties.getLinkAddresses())) {

            if (linkProperties == null || linkProperties.getLinkAddresses().isEmpty()) {

                loge("connect: Can't find link properties of handover data connection. dc="

                        + dc);

                return DataFailCause.HANDOVER_FAILED;