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

Commit 9bfa264f authored by Muralidhar Reddy Mule's avatar Muralidhar Reddy Mule Committed by Automerger Merge Worker
Browse files

Merge "Profile is getting activated on wrong portIndex" into udc-qpr-dev am:... 

Merge "Profile is getting activated on wrong portIndex" into udc-qpr-dev am: 9550ecc5 am: 189dbb12

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/24633508



Change-Id: Ieceebdb88dbe714592686cee9ed89056b689f2a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da67c4c9 189dbb12

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);