ADHOC/replicant-packages_apps_SetupWizard
3
0
Fork 0
Code Issues Pull Requests Releases Activity

SetupWizard: don't crash without SIMs

Browse Source 
SubscriptionManager may be null

Change-Id: Ia2112044400576a93931474a3fff2af161ccda21
Signed-off-by: Roman Birg <roman@cyngn.com>
This commit is contained in:
Roman Birg 2015-03-26 03:44:35 -07:00
parent c225cd58f7
commit 98b5eb9958
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
View File

@ -113,12 +113,15 @@ public class SetupWizardUtils {
public static boolean isSimMissing(Context context) { public static boolean isSimMissing(Context context) {
TelephonyManager tm = TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
int simCount = SubscriptionController.getInstance().getActiveSubInfoCount(); SubscriptionController subscriptionController = SubscriptionController.getInstance();
for (int i = 0; i < simCount; i++) { if (subscriptionController != null) {
int simState = tm.getSimState(i); int simCount = subscriptionController.getActiveSubInfoCount();
if (simState != TelephonyManager.SIM_STATE_ABSENT && for (int i = 0; i < simCount; i++) {
simState != TelephonyManager.SIM_STATE_UNKNOWN) { int simState = tm.getSimState(i);
return false; if (simState != TelephonyManager.SIM_STATE_ABSENT &&
simState != TelephonyManager.SIM_STATE_UNKNOWN) {
return false;
}
} }
} }
return true; return true;