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

AI 144594: am: CL 144593 Fix GSM cell location updates.

Browse Source 
BUG=1761611
  Original author: lockwood

Automated import of CL 144594
This commit is contained in:
Mike Lockwood
2009-04-05 14:16:22 -07:00
committed by The Android Open Source Project
parent 8e2f6a90b4
commit d66737268e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/CellLocation.java
View File

@@ -68,7 +68,7 @@ public abstract class CellLocation {
// NOTE here TelephonyManager.getDefault().getPhoneType() cannot be used since at startup
// ITelephony have not been created
if (RILConstants.CDMA_PHONE ==
SystemProperties.getInt(Settings.Secure.CURRENT_ACTIVE_PHONE, 0)) {
SystemProperties.getInt(Settings.Secure.CURRENT_ACTIVE_PHONE, RILConstants.GSM_PHONE)) {
return new CdmaCellLocation(bundle);
} else {
return new GsmCellLocation(bundle);
@@ -91,7 +91,7 @@ public abstract class CellLocation {
// NOTE here TelephonyManager.getDefault().getPhoneType() cannot be used since at startup
// ITelephony have not been created
if (RILConstants.CDMA_PHONE ==
SystemProperties.getInt(Settings.Secure.CURRENT_ACTIVE_PHONE, 0)) {
SystemProperties.getInt(Settings.Secure.CURRENT_ACTIVE_PHONE, RILConstants.GSM_PHONE)) {
return new CdmaCellLocation();
} else {
return new GsmCellLocation();

4
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
View File

@@ -383,7 +383,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
String states[] = (String[])ar.result;
int lac = -1;
int cid = -1;
if (states.length == 3) {
if (states.length >= 3) {
try {
if (states[1] != null && states[1].length() > 0) {
lac = Integer.parseInt(states[1], 16);
@@ -629,7 +629,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
if (states.length > 0) {
try {
regState = Integer.parseInt(states[0]);
if (states.length == 3) {
if (states.length >= 3) {
if (states[1] != null && states[1].length() > 0) {
lac = Integer.parseInt(states[1], 16);
}