Merge "Fix parseInt format exception." am: 7c08118a61 am: 1138b975c4 am: 52e83fde57 (19973131) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ServiceStateTracker.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -985,10 +985,10 @@ public class ServiceStateTracker extends Handler {
		if (states.length >= 3) {
		try {
		if (states[1] != null && states[1].length() > 0) {
		lac = Integer.parseInt(states[1], 16);
		lac = (int)Long.parseLong(states[1], 16);
		}
		if (states[2] != null && states[2].length() > 0) {
		cid = Integer.parseInt(states[2], 16);
		cid = (int)Long.parseLong(states[2], 16);
		}
		} catch (NumberFormatException ex) {
		Rlog.w(LOG_TAG, "error parsing location: " + ex);
		@@ -1610,10 +1610,10 @@ public class ServiceStateTracker extends Handler {
		regState = Integer.parseInt(states[0]);
		if (states.length >= 3) {
		if (states[1] != null && states[1].length() > 0) {
		lac = Integer.parseInt(states[1], 16);
		lac = (int)Long.parseLong(states[1], 16);
		}
		if (states[2] != null && states[2].length() > 0) {
		cid = Integer.parseInt(states[2], 16);
		cid = (int)Long.parseLong(states[2], 16);
		}

		// states[3] (if present) is the current radio technology
		@@ -1623,7 +1623,7 @@ public class ServiceStateTracker extends Handler {
		}
		if (states.length > 14) {
		if (states[14] != null && states[14].length() > 0) {
		psc = Integer.parseInt(states[14], 16);
		psc = (int)Long.parseLong(states[14], 16);
		}
		}
		} catch (NumberFormatException ex) {