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

Commit bba33cd8 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Fix bug 6563184d: API compatibility issue with quick contact 

Add FLAG_ACTIVITY_NEW_TASK if the starting contentext is not an activity.

Change-Id: I3c03a1acc12798d846c6f321cf46f77a2833172b
parent 58296baa

core/java/android/provider/ContactsContract.java

+13 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.ContentResolver; 
import android.content.ContentUris;

import android.content.ContentValues;

import android.content.Context;

import android.content.ContextWrapper;

import android.content.CursorEntityIterator;

import android.content.Entity;

import android.content.EntityIterator;
@@ -7711,9 +7712,19 @@ public final class ContactsContract { 
         */

        public static void showQuickContact(Context context, Rect target, Uri lookupUri, int mode,

                String[] excludeMimes) {

            // When launching from an Activiy, we don't want to start a new task, but otherwise

            // we *must* start a new task.  (Otherwise startActivity() would crash.)

            Context actualContext = context;

            while ((actualContext instanceof ContextWrapper)

                    && !(actualContext instanceof Activity)) {

                actualContext = ((ContextWrapper) actualContext).getBaseContext();

            }

            final int intentFlags = (actualContext instanceof Activity)

                    ? Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET

                    : Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK;



            // Launch pivot dialog through intent for now

            final Intent intent = new Intent(ACTION_QUICK_CONTACT)

                    .addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);

            final Intent intent = new Intent(ACTION_QUICK_CONTACT).addFlags(intentFlags);



            intent.setData(lookupUri);

            intent.setSourceBounds(target);