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

Commit 736f9050 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android Git Automerger
Browse files

am b4a0b320: Merge "Make quickcontact launchable with am" into jb-dev 

* commit 'b4a0b320':
  Make quickcontact launchable with am
parents ae846169 b4a0b320

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

+4 −3
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class QuickContactActivity extends Activity { 
        Uri lookupUri = intent.getData();



        // Check to see whether it comes from the old version.

        if (LEGACY_AUTHORITY.equals(lookupUri.getAuthority())) {

        if (lookupUri != null && LEGACY_AUTHORITY.equals(lookupUri.getAuthority())) {

            final long rawContactId = ContentUris.parseId(lookupUri);

            lookupUri = RawContacts.getContactLookupUri(getContentResolver(),

                    ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId));
@@ -207,8 +207,9 @@ public class QuickContactActivity extends Activity { 


        // Read requested parameters for displaying

        final Rect sourceBounds = intent.getSourceBounds();

        Preconditions.checkNotNull(sourceBounds, "missing sourceBounds");

        if (sourceBounds != null) {

            mFloatingLayout.setChildTargetScreen(sourceBounds);

        }



        mExcludeMimes = intent.getStringArrayExtra(QuickContact.EXTRA_EXCLUDE_MIMES);