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

Commit b490cb90 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

Change-Id: I58d0fb8f44c48cde005b4a6b19aeba077c32b1fc
parents f893f721 5ad1c1ca

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

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

                final BaseEuiccCommandCallback callback = getCallback(message);

                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 {

                    switch (message.what) {

                        case CMD_GET_EID: {