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

Commit 03a15a48 authored by Hunter Knepshield's avatar Hunter Knepshield Committed by android-build-merger
Browse files

Merge "Use slotId -1 until cardId is fully ready." am: 5ad1c1ca 

am: b490cb90

Change-Id: Id4aea1f0c5b004ac36dad52e28aabaee36c136d6
parents ea93dc13 b490cb90

src/java/com/android/internal/telephony/euicc/EuiccConnector.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -674,7 +674,9 @@ public class EuiccConnector extends StateMachine implements ServiceConnection { 
            } else if (isEuiccCommand(message.what)) {

            } else if (isEuiccCommand(message.what)) {

                final BaseEuiccCommandCallback callback = getCallback(message);

                final BaseEuiccCommandCallback callback = getCallback(message);

                onCommandStart(callback);

                onCommandStart(callback);

                final int slotId = getSlotIdFromCardId(message.arg1);

                // TODO(b/122978614) restore slotId from cardId once cardId is ready

                final int slotId = SubscriptionManager.INVALID_SIM_SLOT_INDEX;

                // final int slotId = getSlotIdFromCardId(message.arg1);

                try {

                try {

                    switch (message.what) {

                    switch (message.what) {

                        case CMD_GET_EID: {

                        case CMD_GET_EID: {