Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee6637da authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Don't crash when sent malformed intent"

parents 8f3aa782 f2ceba09

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

+5 −2
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ import com.android.contacts.util.StructuredPostalUtils; 
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 com.google.common.collect.ImmutableList;
@@ -938,7 +937,11 @@ public class QuickContactActivity extends ContactsActivity { 
                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(