PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am afa9d6ea: Merge change 27283 into eclair

Browse Source 
Merge commit 'afa9d6ea321228add087f753e1e2a3853150d56f' into eclair-plus-aosp

* commit 'afa9d6ea321228add087f753e1e2a3853150d56f':
  Display cell location for CDMA in Phone info screen.
This commit is contained in:
jsh
2009-09-28 10:26:12 -07:00
committed by Android Git Automerger
parent ad088b68b6 afa9d6ea32
commit 57b49b70de
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/com/android/settings/RadioInfo.java
View File

@@ -37,6 +37,7 @@ import android.telephony.PhoneStateListener;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.telephony.NeighboringCellInfo; import android.telephony.NeighboringCellInfo;
import android.telephony.cdma.CdmaCellLocation;
import android.telephony.gsm.GsmCellLocation; import android.telephony.gsm.GsmCellLocation;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
@@ -621,21 +622,42 @@ public class RadioInfo extends Activity {
} }
private final void updateLocation(CellLocation location) { private final void updateLocation(CellLocation location) {
int lac = -1; Resources r = getResources();
int cid = -1;
if (location instanceof GsmCellLocation) { if (location instanceof GsmCellLocation) {
GsmCellLocation loc = (GsmCellLocation)location; GsmCellLocation loc = (GsmCellLocation)location;
lac = loc.getLac(); int lac = loc.getLac();
cid = loc.getCid(); int cid = loc.getCid();
mLocation.setText(r.getString(R.string.radioInfo_lac) + " = "
+ ((lac == -1) ? "unknown" : Integer.toHexString(lac))
+ " "
+ r.getString(R.string.radioInfo_cid) + " = "
+ ((cid == -1) ? "unknown" : Integer.toHexString(cid)));
} else if (location instanceof CdmaCellLocation) {
CdmaCellLocation loc = (CdmaCellLocation)location;
int bid = loc.getBaseStationId();
int sid = loc.getSystemId();
int nid = loc.getNetworkId();
int lat = loc.getBaseStationLatitude();
int lon = loc.getBaseStationLongitude();
mLocation.setText("BID = "
+ ((bid == -1) ? "unknown" : Integer.toHexString(bid))
+ " "
+ "SID = "
+ ((sid == -1) ? "unknown" : Integer.toHexString(sid))
+ " "
+ "NID = "
+ ((nid == -1) ? "unknown" : Integer.toHexString(nid))
+ "\n"
+ "LAT = "
+ ((lat == -1) ? "unknown" : Integer.toHexString(lat))
+ " "
+ "LONG = "
+ ((lon == -1) ? "unknown" : Integer.toHexString(lon)));
} else {
mLocation.setText("unknown");
} }
Resources r = getResources();
mLocation.setText(r.getString(R.string.radioInfo_lac) + " = "
+ ((lac == -1) ? "unknown" : Integer.toHexString(lac))
+ " "
+ r.getString(R.string.radioInfo_cid) + " = "
+ ((cid == -1) ? "unknown" : Integer.toHexString(cid)));
} }
private final void updateNeighboringCids(ArrayList<NeighboringCellInfo> cids) { private final void updateNeighboringCids(ArrayList<NeighboringCellInfo> cids) {