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

Commit 6ab2e6d2 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Rename DEFAULT_CARD_INDEX" am: 3c886760 am: acefc72f am: bb320dfc 

am: a456cab1

Change-Id: Iac1b81723262057ed0474975a3c831bb47ea77e7
parents f4a5824d a456cab1

src/java/com/android/internal/telephony/cat/CatService.java

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ public class CatService extends Handler implements AppInterface { 
     */

    //TODO Need to take care for MSIM

    public static AppInterface getInstance() {

        int slotId = PhoneConstants.DEFAULT_CARD_INDEX;

        int slotId = PhoneConstants.DEFAULT_SLOT_INDEX;

        SubscriptionController sControl = SubscriptionController.getInstance();

        if (sControl != null) {

            slotId = sControl.getSlotIndex(sControl.getDefaultSubId());

src/java/com/android/internal/telephony/uicc/UiccController.java

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ public class UiccController extends Handler { 


    private Integer getCiIndex(Message msg) {

        AsyncResult ar;

        Integer index = new Integer(PhoneConstants.DEFAULT_CARD_INDEX);

        Integer index = new Integer(PhoneConstants.DEFAULT_SLOT_INDEX);



        /*

         * The events can be come in two ways. By explicitly sending it using