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

Merge "Fix crash on potentially missing EuiccManager" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-03-09 03:39:54 +00:00
committed by Android (Google) Code Review
parent b1e1e290af b27c9b507b
commit 35b5d41db3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/MainClear.java
View File

@@ -426,7 +426,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
@VisibleForTesting @VisibleForTesting
protected boolean isEuiccEnabled(Context context) { protected boolean isEuiccEnabled(Context context) {
EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE); EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
return euiccManager.isEnabled(); return euiccManager != null && euiccManager.isEnabled();
} }
@VisibleForTesting @VisibleForTesting

2
src/com/android/settings/ResetNetwork.java
View File

@@ -293,7 +293,7 @@ public class ResetNetwork extends InstrumentedFragment {
} }
EuiccManager euiccManager = EuiccManager euiccManager =
(EuiccManager) context.getSystemService(Context.EUICC_SERVICE); (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
if (!euiccManager.isEnabled()) { if (euiccManager == null || !euiccManager.isEnabled()) {
return false; return false;
} }
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();

2
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -308,7 +308,7 @@ public class MobileNetworkUtils {
public static Boolean showEuiccSettingsDetecting(Context context) { public static Boolean showEuiccSettingsDetecting(Context context) {
final EuiccManager euiccManager = final EuiccManager euiccManager =
(EuiccManager) context.getSystemService(EuiccManager.class); (EuiccManager) context.getSystemService(EuiccManager.class);
if (!euiccManager.isEnabled()) { if (euiccManager == null || !euiccManager.isEnabled()) {
Log.w(TAG, "EuiccManager is not enabled."); Log.w(TAG, "EuiccManager is not enabled.");
return false; return false;
} }