Merge "Re-use portIndex of provisioning profile" into main (0441fd70) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -1331,8 +1331,13 @@ public class EuiccController extends IEuiccController.Stub {
		SubscriptionInfo subscriptionInfo =
		mSubscriptionManager.getActiveSubscriptionInfoForSimSlotIndex(
		slot.getPhoneIdFromPortIndex(portIndex));
		if (subscriptionInfo == null \|\| subscriptionInfo.isOpportunistic()) {
		// If the port is active and empty/opportunistic, return the portIndex.
		if (subscriptionInfo == null
		\|\| subscriptionInfo.isOpportunistic()
		\|\| (mFeatureFlags.esimBootstrapProvisioningFlag()
		&& subscriptionInfo.getProfileClass()
		== SubscriptionManager.PROFILE_CLASS_PROVISIONING)) {
		// If the port is active and has empty/opportunistic/provisioning
		// profiles then return the portIndex.
		return portIndex;
		}
		}