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

Commit dbd31fc0 authored by nadlabak's avatar nadlabak Committed by Pavel Kucera
Browse files

Contacts: Use correct SIM contacts uri without MultiSIM 

Fix the ability to import contacts from SIM card on non-MultiSIM devices
JIRA: CYAN-5642

Change-Id: I6b3d7276e3989d6a0284485a8811c12239bdf95b
parent e675a5df

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

+7 −4
Original line number Diff line number Diff line
@@ -770,12 +770,15 @@ public class MultiPickContactActivity extends ListActivity implements 
                break;

            case MODE_DEFAULT_SIM:

            case MODE_SEARCH_SIM:

                if (isMultiSimEnabled() &&

                        getIntent().getIntExtra(MSimConstants.SUBSCRIPTION_KEY, 0) == SUB2) {

                if (isMultiSimEnabled()) {

                    if (getIntent().getIntExtra(MSimConstants.SUBSCRIPTION_KEY, 0) == SUB2) {

                        uri = Uri.parse("content://iccmsim/adn_sub2");

                    } else {

                        uri = Uri.parse("content://iccmsim/adn");

                    }

                } else {

                    uri = Uri.parse("content://icc/adn");

                }

                break;

            default:

                throw new IllegalArgumentException("getUriToQuery: Incorrect mode: " + mMode);