commit b36f4023bfe28623ea77aa0294653cdf620e7d2e
author Jay Shrauner <shrauner@google.com> Mon Nov 24 20:01:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 24 20:01:00 2014 +0000
tree f507cb7169abf1bf25854a3e43b3fb2c46b109b0
parent 651361ce5846ceb479a96210456377f14aed050a
parent fcfcae34bd2d74e71ee218cfd7aa3567d7c3fc26

am fcfcae34: Don\'t crash when sent malformed intent

* commit 'fcfcae34bd2d74e71ee218cfd7aa3567d7c3fc26':
  Don't crash when sent malformed intent

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(