From 9ee66404b73f46c60905cf538dd6c10e90e53970 Mon Sep 17 00:00:00 2001 From: Brian Attwell Date: Mon, 11 Aug 2014 22:42:26 -0700 Subject: [PATCH] Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP Since launchMode=singleTop is broken in the framework. Bug: 16519102 Change-Id: I136821ab9d4493c51f03332cee1e3924a1bd361b --- core/java/android/provider/ContactsContract.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 7e1c0699c591f..4f35b16043d53 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -8164,8 +8164,10 @@ public final class ContactsContract { && !(actualContext instanceof Activity)) { actualContext = ((ContextWrapper) actualContext).getBaseContext(); } - final int intentFlags = (actualContext instanceof Activity) - ? 0 : Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK; + final int intentFlags = ((actualContext instanceof Activity) + ? 0 : Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK) + // Workaround for b/16898764. Declaring singleTop in manifest doesn't work. + | Intent.FLAG_ACTIVITY_SINGLE_TOP; // Launch pivot dialog through intent for now final Intent intent = new Intent(ACTION_QUICK_CONTACT).addFlags(intentFlags);