diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-01-17 14:20:50 -0800 |
|---|---|---|
| committer | Jay Shrauner <shrauner@google.com> | 2014-03-01 19:55:50 +0000 |
| commit | ea6e4ec315d71bff9b97dff652a9bf92f384270c (patch) | |
| tree | dedcfaecfc678f9af33fee624961d9635ed0ef4f | |
| parent | 49a9c120b0b6e3942bc950143f1e2970c8ff374a (diff) | |
| download | android_packages_apps_Contacts-ea6e4ec315d71bff9b97dff652a9bf92f384270c.tar.gz android_packages_apps_Contacts-ea6e4ec315d71bff9b97dff652a9bf92f384270c.tar.bz2 android_packages_apps_Contacts-ea6e4ec315d71bff9b97dff652a9bf92f384270c.zip | |
Fix crash on missing mimetype
Fix so ContactSaveService shows a toast instead of crashing if called
with malformed intent.
Bug:12622453
Change-Id: I0495649574a90eeb1960de65b22f051a1dc78c78
(cherry picked from commit 57fca1851e5371f259d4dd6bdf322e20c606c975)
| -rw-r--r-- | src/com/android/contacts/ContactSaveService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java index 7a8f9f392..ff76844eb 100644 --- a/src/com/android/contacts/ContactSaveService.java +++ b/src/com/android/contacts/ContactSaveService.java @@ -410,6 +410,12 @@ public class ContactSaveService extends IntentService { Log.e(TAG, "Problem persisting user edits", e); break; + } catch (IllegalArgumentException e) { + // This is thrown by applyBatch on malformed requests + Log.e(TAG, "Problem persisting user edits", e); + showToast(R.string.contactSavedErrorToast); + break; + } catch (OperationApplicationException e) { // Version consistency failed, re-parent change and try again Log.w(TAG, "Version consistency failed, re-parenting: " + e.toString()); |