commit 0809978e5d3f87687e1fd986130897deca1f74cd
author Jay Shrauner <shrauner@google.com> Wed Mar 25 14:17:11 2015 -0700
committer Jay Shrauner <shrauner@google.com> Thu Mar 26 10:05:54 2015 -0700
tree 63a57fb66589adb44871fd3258ea5e6002dff208
parent c57b8fd498061429922323f48dde1961840154cf

Fix NPE when EXTRA_CONTACT_STATE not set

Bug:19931085
Change-Id: I679ea5382ed6b1bb1bdd99a5c03d9c7bcb023417

src/com/android/contacts/ContactSaveService.java

diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 4c3671f..2680e83 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -343,6 +343,11 @@
         boolean isProfile = intent.getBooleanExtra(EXTRA_SAVE_IS_PROFILE, false);
         Bundle updatedPhotos = intent.getParcelableExtra(EXTRA_UPDATED_PHOTOS);
 
+        if (state == null) {
+            Log.e(TAG, "Invalid arguments for saveContact request");
+            return;
+        }
+
         // Trim any empty fields, and RawContacts, before persisting
         final AccountTypeManager accountTypes = AccountTypeManager.getInstance(this);
         RawContactModifier.trimEmpty(state, accountTypes);