summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblong <blong@codeaurora.org>2016-09-01 15:23:23 +0800
committerblong <blong@codeaurora.org>2016-09-01 15:27:36 +0800
commit401ce19665f3c333cf6c4b9db834163017b177a9 (patch)
treee3b9ee5a53479a33516380460ce8a99bbd212c24
parente87079ee422b918b8e1510301fddbe3764ec4255 (diff)
downloadpackages_apps_Contacts-401ce19665f3c333cf6c4b9db834163017b177a9.tar.gz
packages_apps_Contacts-401ce19665f3c333cf6c4b9db834163017b177a9.tar.bz2
packages_apps_Contacts-401ce19665f3c333cf6c4b9db834163017b177a9.zip
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
-rwxr-xr-xsrc/com/android/contacts/activities/MultiPickContactsActivity.java5
-rwxr-xr-x[-rw-r--r--]src/com/android/contacts/multipicker/ContactsFragment.java3
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();