summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-08-11 22:42:26 -0700
committerBrian Attwell <brianattwell@google.com>2014-08-12 06:03:41 +0000
commit9ee66404b73f46c60905cf538dd6c10e90e53970 (patch)
tree2bae230f981b9e4c3f0d1d0f84c8385513b493d2 /core/java/android/provider
parentd4c25dbe67ca1c46105d09905be7bd6fdcecf35b (diff)
downloadframeworks_base-9ee66404b73f46c60905cf538dd6c10e90e53970.zip
frameworks_base-9ee66404b73f46c60905cf538dd6c10e90e53970.tar.gz
frameworks_base-9ee66404b73f46c60905cf538dd6c10e90e53970.tar.bz2
Compose QC intent with FLAG_ACTIVITY_SINGLE_TOP
Since launchMode=singleTop is broken in the framework. Bug: 16519102 Change-Id: I136821ab9d4493c51f03332cee1e3924a1bd361b
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/ContactsContract.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 7e1c069..4f35b16 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);