diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 11:54:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 11:54:48 -0700 |
| commit | 6647da1fa8f5126b09b9ce47ab30f03417eb5700 (patch) | |
| tree | 2ddc8516f880635b36570a94eac481a65de07c8c /services | |
| parent | 37e036fb81b36f36afea150d61a4f634d78150af (diff) | |
| parent | 75e1d3137cdcdb88783795d3f1fe735098330fa8 (diff) | |
| download | frameworks_base-6647da1fa8f5126b09b9ce47ab30f03417eb5700.zip frameworks_base-6647da1fa8f5126b09b9ce47ab30f03417eb5700.tar.gz frameworks_base-6647da1fa8f5126b09b9ce47ab30f03417eb5700.tar.bz2 | |
Merge change 21919 into eclair
* changes:
Fix exception when reporting disconn cdma state.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/TelephonyRegistry.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/TelephonyRegistry.java b/services/java/com/android/server/TelephonyRegistry.java index 7379b5d..170a9f8 100644 --- a/services/java/com/android/server/TelephonyRegistry.java +++ b/services/java/com/android/server/TelephonyRegistry.java @@ -535,9 +535,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { intent.putExtra(Phone.STATE_CHANGE_REASON_KEY, reason); } intent.putExtra(Phone.DATA_APN_KEY, apn); - String types = apnTypes[0]; - for (int i = 1; i < apnTypes.length; i++) { - types = types+","+apnTypes[i]; + String types = new String(""); + if (apnTypes.length > 0) { + 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_IFACE_NAME_KEY, interfaceName); |