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

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Browse Source 
Automated import of CL 144245
This commit is contained in:
Wink Saville
2009-04-02 11:00:54 -07:00
committed by The Android Open Source Project
parent 3afdd56470
commit 04e71b3db8
189 changed files with 24484 additions and 8162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
location/java/com/android/internal/location/CellState.java
View File

@@ -60,9 +60,11 @@ public class CellState {
}
public CellState(TelephonyManager telephonyManager, CellLocation location, int signalStrength) {
GsmCellLocation loc = (GsmCellLocation)location;
mLac = loc.getLac(); // example: 6032
mCid = loc.getCid(); // example: 31792
if (location instanceof GsmCellLocation) {
GsmCellLocation loc = (GsmCellLocation)location;
mLac = loc.getLac(); // example: 6032
mCid = loc.getCid(); // example: 31792
}
mTime = System.currentTimeMillis();
// Get radio type
@@ -72,6 +74,11 @@ public class CellState {
mRadioType = RADIO_TYPE_GPRS;
} else if (radioType == TelephonyManager.NETWORK_TYPE_UMTS) {
mRadioType = RADIO_TYPE_WCDMA;
} else if (radioType == TelephonyManager.NETWORK_TYPE_CDMA ||
radioType == TelephonyManager.NETWORK_TYPE_EVDO_0 ||
radioType == TelephonyManager.NETWORK_TYPE_EVDO_A ||
radioType == TelephonyManager.NETWORK_TYPE_1xRTT) {
mRadioType = RADIO_TYPE_CDMA;
}
// Get neighboring cells
@@ -290,3 +297,4 @@ public class CellState {
}
}
}