Merge "Add a try-catch statement to handle the runtime exception" into main (ebc05f13) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java

+15 −10

Original line number	Diff line number	Diff line
		@@ -125,17 +125,22 @@ public class ConvertToEsimPreferenceController extends TelephonyBasePreferenceCo
		}
		EuiccManager euiccManager = (EuiccManager)
		mContext.getSystemService(Context.EUICC_SERVICE);
		try {
		if (!euiccManager.isPsimConversionSupported(subInfo.getCarrierId())) {
		Log.i(TAG, "subId is not matched with pSIM conversion"
		+ " supported carriers:" + subInfo.getCarrierId());
		return CONDITIONALLY_UNAVAILABLE;
		}
		if (findConversionSupportComponent()) {
		return mSubscriptionInfoEntity != null && mSubscriptionInfoEntity.isActiveSubscriptionId
		return mSubscriptionInfoEntity != null
		&& mSubscriptionInfoEntity.isActiveSubscriptionId
		&& !mSubscriptionInfoEntity.isEmbedded && isActiveSubscription(subId)
		? AVAILABLE
		: CONDITIONALLY_UNAVAILABLE;
		}
		} catch (RuntimeException e) {
		Log.e(TAG, "Fail to check pSIM conversion supported carrier: " + e.getMessage());
		}
		return CONDITIONALLY_UNAVAILABLE;
		}