Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 401ce196 authored by blong's avatar blong
Browse files

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
parent e87079ee

src/com/android/contacts/activities/MultiPickContactsActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -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;

src/com/android/contacts/multipicker/ContactsFragment.java

100644 → 100755
+1 −2
Original line number Diff line number Diff line
@@ -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();