diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-11-09 21:30:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-09 21:30:27 +0000 |
| commit | 7f1fc5e58ed9b4cf22b91f440548c6f8a23415a4 (patch) | |
| tree | cf5a6135406ade9f621be7635b878b36759e7c38 | |
| parent | 962e1be7e9733d75e15dc85fd29184870b05381a (diff) | |
| parent | cecbabcec6edf19ad1a095325fb0d9c48375de69 (diff) | |
| download | android_packages_providers_TelephonyProvider-7f1fc5e58ed9b4cf22b91f440548c6f8a23415a4.tar.gz android_packages_providers_TelephonyProvider-7f1fc5e58ed9b4cf22b91f440548c6f8a23415a4.tar.bz2 android_packages_providers_TelephonyProvider-7f1fc5e58ed9b4cf22b91f440548c6f8a23415a4.zip | |
Try-catch for deletePreferredApnId()
am: cecbabcec6
* commit 'cecbabcec6edf19ad1a095325fb0d9c48375de69':
Try-catch for deletePreferredApnId()
| -rw-r--r-- | src/com/android/providers/telephony/TelephonyProvider.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java index bf7dc74..bf77aec 100644 --- a/src/com/android/providers/telephony/TelephonyProvider.java +++ b/src/com/android/providers/telephony/TelephonyProvider.java @@ -1453,10 +1453,14 @@ public class TelephonyProvider extends ContentProvider Map<String, ?> allPrefApnId = sp.getAll(); for (String key : allPrefApnId.keySet()) { // extract subId from key by removing COLUMN_APN_ID - int subId = Integer.parseInt(key.replace(COLUMN_APN_ID, "")); - long apnId = getPreferredApnId(subId, false); - if (apnId != INVALID_APN_ID) { - setPreferredApn(apnId, subId); + try { + int subId = Integer.parseInt(key.replace(COLUMN_APN_ID, "")); + long apnId = getPreferredApnId(subId, false); + if (apnId != INVALID_APN_ID) { + setPreferredApn(apnId, subId); + } + } catch (Exception e) { + loge("Skipping over key " + key + " due to exception " + e); } } SharedPreferences.Editor editor = sp.edit(); |