diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 15:57:42 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 15:57:42 -0700 |
| commit | f78964490d8098387d51444c87bf520ad3f674e2 (patch) | |
| tree | 7384d69f165ea9a1d1a004a54b05155d29f1249e /telephony | |
| parent | fc12b5be2ee49ba2392274d413bd5d759c03c346 (diff) | |
| parent | 1e936da287e1836502bf91b53468076726b7e1ee (diff) | |
| download | frameworks_base-f78964490d8098387d51444c87bf520ad3f674e2.zip frameworks_base-f78964490d8098387d51444c87bf520ad3f674e2.tar.gz frameworks_base-f78964490d8098387d51444c87bf520ad3f674e2.tar.bz2 | |
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/NeighboringCellInfo.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/NeighboringCellInfo.java b/telephony/java/android/telephony/NeighboringCellInfo.java index ad7dfc9..2f7666d 100644 --- a/telephony/java/android/telephony/NeighboringCellInfo.java +++ b/telephony/java/android/telephony/NeighboringCellInfo.java @@ -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]; } }; -}
\ No newline at end of file +} |