Merge "Fix FC when drag delete call log to split screen" into android_ui.lnx.2.1-dev

2 files changed, 3 insertions, 5 deletions

diff --git a/src/com/android/contacts/activities/MultiPickContactsActivity.java b/src/com/android/contacts/activities/MultiPickContactsActivity.java
index 8d7824117..e276545a5 100755
--- a/src/com/android/contacts/activities/MultiPickContactsActivity.java
+++ b/src/com/android/contacts/activities/MultiPickContactsActivity.java
@@ -246,7 +246,7 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP
             // occur crash.
             position = getRtlPosition(position);
 
-            if (mAreTabsHiddenInViewPager) {
+            if (mAreTabsHiddenInViewPager || mPickMode.isPickCall()) {
                 if (mPickMode.isPickCall()) {
                     mDelCallLogFragment = new DelCallLogFragment();
                     mDelCallLogFragment.setCheckListListener(new CheckListListener());
@@ -295,8 +295,7 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP
         public Object instantiateItem(ViewGroup container, int position) {
 
             Fragment f = (Fragment) super.instantiateItem(container, position);
-
-            if (mAreTabsHiddenInViewPager) {
+            if (mAreTabsHiddenInViewPager || mPickMode.isPickCall()) {
                 if (mPickMode.isPickCall()) {
                     if (mDelCallLogFragment == null) {
                         mDelCallLogFragment = (DelCallLogFragment) f;
diff --git a/src/com/android/contacts/multipicker/ContactsFragment.java b/src/com/android/contacts/multipicker/ContactsFragment.java
index ac11f45fe..ac8ae24d9 100644..100755
--- a/src/com/android/contacts/multipicker/ContactsFragment.java
+++ b/src/com/android/contacts/multipicker/ContactsFragment.java
@@ -423,8 +423,7 @@ public class ContactsFragment extends ListFragment {
                 uri = Contacts.CONTENT_URI;
                 break;
             default:
-                throw new IllegalArgumentException("getUriToQuery: Incorrect mode: "
-                        + mPickMode.getMode());
+                uri = Contacts.CONTENT_URI;
         }
         return uri.buildUpon().appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true")
                 .build();