commit f3ee899e1897e143cec01ce26d81030b352083eb
author Dmitri Plotnikov <dplotnikov@google.com> Thu Feb 25 15:25:19 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Thu Feb 25 15:25:19 2010 -0800
tree b53c49e451b8db1d0063ec07bf833fe1294fd8ec
parent 558f463c8104013eb0327f8958654956cd187531

Fixing the "add contact from call log" flow involving search.

Bug: 2310010
Change-Id: I31bd5a62e47a23d2c2236205967a5fd7e891a1e6

src/com/android/contacts/ContactsSearchManager.java

diff --git a/src/com/android/contacts/ContactsSearchManager.java b/src/com/android/contacts/ContactsSearchManager.java
index 8f42c3a..d65e079 100644
--- a/src/com/android/contacts/ContactsSearchManager.java
+++ b/src/com/android/contacts/ContactsSearchManager.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Intents.UI;
 
@@ -54,10 +55,15 @@
         Intent intent = new Intent();
         intent.setData(ContactsContract.Contacts.CONTENT_URI);
         intent.setAction(UI.FILTER_CONTACTS_ACTION);
+
+        Intent originalIntent = context.getIntent();
+        Bundle originalExtras = originalIntent.getExtras();
+        if (originalExtras != null) {
+            intent.putExtras(originalExtras);
+        }
         intent.putExtra(UI.FILTER_TEXT_EXTRA_KEY, initialQuery);
-        intent.putExtra(ORIGINAL_ACTION_EXTRA_KEY, context.getIntent().getAction());
-        intent.putExtra(ORIGINAL_COMPONENT_EXTRA_KEY,
-                context.getIntent().getComponent().getClassName());
+        intent.putExtra(ORIGINAL_ACTION_EXTRA_KEY, originalIntent.getAction());
+        intent.putExtra(ORIGINAL_COMPONENT_EXTRA_KEY, originalIntent.getComponent().getClassName());
         return intent;
     }
 }