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

Commit df738c95 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10797983 from 9550ecc5 to udc-qpr1-release 

Change-Id: Ie7f1b194365ebda6c163c6c1cce82d02cf693fe7
parents dbcd29d2 9550ecc5

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

+13 −0
Original line number Diff line number Diff line
@@ -191,6 +191,19 @@ public class EuiccController extends IEuiccController.Stub { 
            boolean usePortIndex = resolutionIntent.getBooleanExtra(

                    EuiccService.EXTRA_RESOLUTION_USE_PORT_INDEX, false);

            resolutionExtras.putBoolean(EuiccService.EXTRA_RESOLUTION_USE_PORT_INDEX, usePortIndex);



            if (!EuiccService.ACTION_RESOLVE_NO_PRIVILEGES.equals(resolutionIntent.getAction())

                    || !resolutionExtras.containsKey(EuiccService.EXTRA_RESOLUTION_PORT_INDEX)) {

                // Port index resolution is requested only through the ACTION_RESOLVE_NO_PRIVILEGES

                // action. Therefore, if the action is not ACTION_RESOLVE_NO_PRIVILEGES, use the

                // port index from the resolution intent.

                // (OR) If the action is ACTION_RESOLVE_NO_PRIVILEGES and resolutionExtras does not

                // contain the EXTRA_RESOLUTION_PORT_INDEX key, retrieve the port index from

                // resolutionIntent.

                resolutionExtras.putInt(EuiccService.EXTRA_RESOLUTION_PORT_INDEX,

                        resolutionIntent.getIntExtra(EuiccService.EXTRA_RESOLUTION_PORT_INDEX,

                                TelephonyManager.DEFAULT_PORT_INDEX));

            }

            Log.i(TAG, " continueOperation portIndex: " + resolutionExtras.getInt(

                    EuiccService.EXTRA_RESOLUTION_PORT_INDEX) + " usePortIndex: " + usePortIndex);

            op.continueOperation(cardId, resolutionExtras, callbackIntent);