commit 2994462deb5138ddc8f104a53e81b854f1bd323d
author Jay Shrauner <shrauner@google.com> Mon Nov 24 19:46:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 24 19:46:12 2014 +0000
tree 746a5e5a8451675b4da51cd90a9fd97dd2fb99c3
parent fcfcae34bd2d74e71ee218cfd7aa3567d7c3fc26
parent c12a280b496e6a997ab972641fb8e50e1eb8736c

Merge "Fix NPE in ContactSaveService" into lmp-mr1-dev

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index a03b514..b3b6b54 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -145,7 +145,6 @@
 import com.android.contacts.widget.MultiShrinkScroller;
 import com.android.contacts.widget.MultiShrinkScroller.MultiShrinkScrollerListener;
 import com.android.contacts.widget.QuickContactImageView;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
@@ -790,7 +789,11 @@
                 QuickContact.MODE_LARGE);
         final Uri oldLookupUri = mLookupUri;
 
-        mLookupUri = Preconditions.checkNotNull(lookupUri, "missing lookupUri");
+        if (lookupUri == null) {
+            finish();
+            return;
+        }
+        mLookupUri = lookupUri;
         mExcludeMimes = intent.getStringArrayExtra(QuickContact.EXTRA_EXCLUDE_MIMES);
         if (oldLookupUri == null) {
             mContactLoader = (ContactLoader) getLoaderManager().initLoader(