Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "telephony: Fix CID when CID is unknown"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-05-05 13:15:24 -07:00
committed by Android Code Review
parent f1fdf3c7e8 c6dd77d04a
commit 0938ef4215
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/NeighboringCellInfo.java
View File

@@ -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);
mCid = Integer.valueOf(location.substring(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:
@@ -293,4 +296,4 @@ public class NeighboringCellInfo implements Parcelable
return new NeighboringCellInfo[size];
}
};
}
}