Fix parseInt format exception.
In the radio logs I see the following exception:
08-09 14:41:27.849 E/GsmSST ( 1006): [GsmSST] error parsing RegistrationState: java.lang.NumberFormatException: Invalid int: "ffffffff"
The issue is that parseInt doesn't go to 0xffffffff.
parseLong does and it returns -1 when passed ffffffff
Change-Id: Ie98873cefb551cc88075d39b64164b130130d0e0
diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 3f69f6d..616fa18 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -969,10 +969,10 @@
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);
@@ -1595,10 +1595,10 @@
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
@@ -1608,7 +1608,7 @@
}
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) {
