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

Commit 0938ef42 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "telephony: Fix CID when CID is unknown"

parents f1fdf3c7 c6dd77d0

telephony/java/android/telephony/NeighboringCellInfo.java

+6 −3
Original line number Diff line number Diff line
@@ -133,8 +133,11 @@ public class NeighboringCellInfo implements Parcelable 
            case NETWORK_TYPE_GPRS:

            case NETWORK_TYPE_EDGE:

                mNetworkType = radioType;

                mLac = Integer.valueOf(location.substring(0, 4), 16);

                // check if 0xFFFFFFFF for UNKNOWN_CID

                if (!location.equalsIgnoreCase("FFFFFFFF")) {

                    mCid = Integer.valueOf(location.substring(4), 16);

                    mLac = Integer.valueOf(location.substring(0, 4), 16);

                }

                break;

            case NETWORK_TYPE_UMTS:

            case NETWORK_TYPE_HSDPA: