Revert "Fix to not crash on failure to parse non-integer values."
This reverts commit 717d35d02a0b14fb612b8ab81f801731f0af74ca.
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index de50f48..f901b47 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -553,91 +553,47 @@
// bool/int vals
val = getValueFromCursor(c, Telephony.Carriers.AUTH_TYPE);
if (val != null) {
- try {
- cv.put(Telephony.Carriers.AUTH_TYPE, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
+ cv.put(Telephony.Carriers.AUTH_TYPE, new Integer(val));
}
val = getValueFromCursor(c, Telephony.Carriers.CURRENT);
if (val != null) {
- try {
cv.put(Telephony.Carriers.CURRENT, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.CARRIER_ENABLED);
if (val != null) {
- try {
cv.put(Telephony.Carriers.CARRIER_ENABLED, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.BEARER);
if (val != null) {
- try {
cv.put(Telephony.Carriers.BEARER, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.SUBSCRIPTION_ID);
if (val != null) {
- try {
cv.put(Telephony.Carriers.SUBSCRIPTION_ID, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.PROFILE_ID);
if (val != null) {
- try {
cv.put(Telephony.Carriers.PROFILE_ID, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.MODEM_COGNITIVE);
if (val != null) {
- try {
cv.put(Telephony.Carriers.MODEM_COGNITIVE, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.MAX_CONNS);
if (val != null) {
- try {
cv.put(Telephony.Carriers.MAX_CONNS, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.WAIT_TIME);
if (val != null) {
- try {
cv.put(Telephony.Carriers.WAIT_TIME, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.MAX_CONNS_TIME);
if (val != null) {
- try {
cv.put(Telephony.Carriers.MAX_CONNS_TIME, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
val = getValueFromCursor(c, Telephony.Carriers.MTU);
if (val != null) {
- try {
cv.put(Telephony.Carriers.MTU, new Integer(val));
- } catch (NumberFormatException nfe) {
- // do nothing
- }
}
// New USER_EDITED column. Default value (USER_EDITED_UNTOUCHED) will