Merge change 21919 into eclair

* changes:
  Fix exception when reporting disconn cdma state.
This commit is contained in:
Android (Google) Code Review
2009-08-19 11:54:48 -07:00

View File

@@ -535,9 +535,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
intent.putExtra(Phone.STATE_CHANGE_REASON_KEY, reason); intent.putExtra(Phone.STATE_CHANGE_REASON_KEY, reason);
} }
intent.putExtra(Phone.DATA_APN_KEY, apn); intent.putExtra(Phone.DATA_APN_KEY, apn);
String types = apnTypes[0]; String types = new String("");
for (int i = 1; i < apnTypes.length; i++) { if (apnTypes.length > 0) {
types = types+","+apnTypes[i]; types = apnTypes[0];
for (int i = 1; i < apnTypes.length; i++) {
types = types+","+apnTypes[i];
}
} }
intent.putExtra(Phone.DATA_APN_TYPES_KEY, types); intent.putExtra(Phone.DATA_APN_TYPES_KEY, types);
intent.putExtra(Phone.DATA_IFACE_NAME_KEY, interfaceName); intent.putExtra(Phone.DATA_IFACE_NAME_KEY, interfaceName);