From 401ce19665f3c333cf6c4b9db834163017b177a9 Mon Sep 17 00:00:00 2001 From: blong Date: Thu, 1 Sep 2016 15:23:23 +0800 Subject: Fix FC when drag delete call log to split screen - Remove throw exception since call log uri not defined here - Correct hide tab judges to avoid wrong reference CRs-Fixed: 1062064 Change-Id: I6c0a6fc9ff097eb6a2dd9262c6aebb2610a6ddd8 --- src/com/android/contacts/activities/MultiPickContactsActivity.java | 5 ++--- src/com/android/contacts/multipicker/ContactsFragment.java | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) mode change 100644 => 100755 src/com/android/contacts/multipicker/ContactsFragment.java 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 old mode 100644 new mode 100755 index ac11f45fe..ac8ae24d9 --- 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(); -- cgit v1.2.3