diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-05 16:00:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-05 16:00:01 -0700 |
commit | 579e08e657a8dc9274b297b5dda95a4383cc3642 (patch) | |
tree | 0b1113f2c57867bd95b7cba17a315363845b389a /telephony | |
parent | 33232d26bb51bf015fdf7dbd7a34c2b67745d72a (diff) | |
parent | f78964490d8098387d51444c87bf520ad3f674e2 (diff) | |
download | frameworks_base-579e08e657a8dc9274b297b5dda95a4383cc3642.zip frameworks_base-579e08e657a8dc9274b297b5dda95a4383cc3642.tar.gz frameworks_base-579e08e657a8dc9274b297b5dda95a4383cc3642.tar.bz2 |
am f7896449: merge from open-source master
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken
* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
Add new keycodes for the convenience of Japanese IMEs
Call register_localized_collators() with the current locale.
Fixed deserialization problem in DatePicker.
Fix for bug 2467152 files with spaces fail to open.
Set alpha value for newly created dim surface.
telephony: Fix CID when CID is unknown
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 +} |