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

Commit 5bb5c008 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

resolve merge conflicts of 1fe47e3b to pi-dev-plus-aosp 

am: 47722ca2

Change-Id: I684193e2abe231378444e0c189b9ed36d68897a3
parents 876fc1ac 47722ca2

src/java/com/android/internal/telephony/LocaleTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.util.LocalLog;



import com.android.internal.util.CollectionUtils;

import com.android.internal.util.IndentingPrintWriter;



import java.io.FileDescriptor;
@@ -257,7 +256,8 @@ public class LocaleTracker extends Handler { 
        String msg = "getCellInfo: cell info=" + mCellInfo;

        if (DBG) log(msg);

        mLocalLog.log(msg);

        if (CollectionUtils.isEmpty(mCellInfo)) {



        if (mCellInfo == null || mCellInfo.size() == 0) {

            // If we can't get a valid cell info. Try it again later.

            long delay = getCellInfoDelayTime(++mFailCellInfoCount);

            if (DBG) log("Can't get cell info. Try again in " + delay / 1000 + " secs.");