PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a try-catch statement to handle the runtime exception" into main

Browse Source
This commit is contained in:
Hyunho Shin
2024-04-23 10:51:29 +00:00
committed by Android (Google) Code Review
parent 82e6ad5098 fa2f6ebce4
commit ebc05f131d
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/telephony/ConvertToEsimPreferenceController.java
View File

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