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

Commit 01e6ab92 authored by Sandeep Gutta's avatar Sandeep Gutta Committed by Natiq Ahmed
Browse files

Change subId to int from long 

Change subId to int from long

Change-Id: Ic0ba28cd9dd5fda797e423c8c63ed884709a9133
parent 6369a970

src/com/android/contacts/ContactSaveService.java

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ public class ContactSaveService extends IntentService { 
        if (0 != mSimMaxCount[subscription]) {

            return mSimMaxCount[subscription];

        }

        long[] subId = SubscriptionManager.getSubId(subscription);

        int[] subId = SubscriptionManager.getSubId(subscription);

        try {

            IIccPhoneBook iccIpb = IIccPhoneBook.Stub.asInterface(

                ServiceManager.getService("simphonebook"));
@@ -740,7 +740,7 @@ public class ContactSaveService extends IntentService { 
            int count = 0;

            Cursor c = null;

            Uri iccUri;

            long[] subId = SubscriptionManager.getSubId(subscription);

            int[] subId = SubscriptionManager.getSubId(subscription);

            if (!TelephonyManager.getDefault().isMultiSimEnabled()) {

                iccUri = Uri.parse(SimContactsConstants.SIM_URI);

            } else {

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

+3 −3
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ public class MultiPickContactActivity extends ListActivity implements 
                int slotId = getIntent().getIntExtra(

                        SimContactsConstants.SUB, SimContactsConstants.SUB_INVALID);

                if (SimContactsConstants.SUB_INVALID != slotId) {

                    long[] subId = SubscriptionManager.getSubId(slotId);

                    int[] subId = SubscriptionManager.getSubId(slotId);

                    if (subId != null && subId.length >= 1) {

                        selection = Calls.PHONE_ACCOUNT_ID + "=" + subId[0];

                    }
@@ -1407,7 +1407,7 @@ public class MultiPickContactActivity extends ListActivity implements 
                    int slotId = SimContactsConstants.SUB_INVALID;

                    if (accountId != null) {

                        try {

                            slotId = SubscriptionManager.getSlotId(Long.valueOf(accountId));

                            slotId = SubscriptionManager.getSlotId(Integer.valueOf(accountId));

                        } catch (NumberFormatException e) {

                            // ignore and keep the default 'invalid'

                        }
@@ -1544,7 +1544,7 @@ public class MultiPickContactActivity extends ListActivity implements 
                && subscription != SimContactsConstants.SUB_2) {

            return uri;

        }

        long[] subId = SubscriptionManager.getSubId(subscription);

        int[] subId = SubscriptionManager.getSubId(subscription);

        if (subId != null && isMultiSimEnabled()) {

            uri = Uri.parse(SimContactsConstants.SIM_SUB_URI + subId[0]);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ public class PeopleActivity extends ContactsActivity implements 
                boolean simImported = false;

                if (TelephonyManager.SIM_STATE_READY == TelephonyManager

                        .getDefault().getSimState(i)) {

                    long[] subId = SubscriptionManager.getSubId(i);

                    int[] subId = SubscriptionManager.getSubId(i);

                    if (subId == null) {

                        continue;

                    }