Merge "Fix crash when the FEATURE_TELEPHONY_EUICC is not defined" into main
diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index a153090..86b3afe 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -1462,15 +1462,18 @@
mQueuedWork.execute(new Runnable() {
@Override
public void run() {
- if (!mEuiccManager.isEnabled()) {
- mEuiccInfoResult = "Not enabled";
- }
- try {
- mEuiccInfoResult = " { Available memory in bytes:"
- + mEuiccManager.getAvailableMemoryInBytes()
- + " }";
- } catch (Exception e) {
- mEuiccInfoResult = e.getMessage();
+ if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC)) {
+ mEuiccInfoResult = "Euicc Feature is disabled";
+ } else if (mEuiccManager == null || !mEuiccManager.isEnabled()) {
+ mEuiccInfoResult = "EuiccManager is not enabled";
+ } else {
+ try {
+ mEuiccInfoResult = " { Available memory in bytes:"
+ + mEuiccManager.getAvailableMemoryInBytes()
+ + " }";
+ } catch (Exception e) {
+ mEuiccInfoResult = e.getMessage();
+ }
}
mHandler.post(setEuiccInfo);
}