Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9db7c9f authored Apr 05, 2009 by Mike Lockwood Committed by The Android Open Source Project Apr 05, 2009

AI 144593: Fix GSM cell location updates.

  BUG=1761611

Automated import of CL 144593

parent c2303193

telephony/java/android/telephony/CellLocation.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}