commit 57fca1851e5371f259d4dd6bdf322e20c606c975
author Jay Shrauner <shrauner@google.com> Fri Jan 17 14:20:50 2014 -0800
committer Jay Shrauner <shrauner@google.com> Tue Jan 21 09:01:24 2014 -0800
tree 0cb144f8245bd3f6ba601dcf1dc16c2e2fa549d7
parent b126f4a7427095468ee66fa4c3b9586f0b889288

Fix crash on missing mimetype

Fix so ContactSaveService shows a toast instead of crashing if called
with malformed intent.

Bug:12622453
Change-Id: I0495649574a90eeb1960de65b22f051a1dc78c78

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 7a8f9f3..ff76844 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -410,6 +410,12 @@
                 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());