From edaab88f133dee6a4a1281647d98ba4a24d34dfb Mon Sep 17 00:00:00 2001 From: cretin45 Date: Thu, 17 Sep 2015 13:48:55 -0700 Subject: [PATCH] SetupWizard: Tweak logic for showing/hiding sim missing page CYNGNOS-1021 Change-Id: I6139ca4368eb1bf49b07a95ac60ca28831e2cd3a --- .../setupwizard/setup/CMSetupWizardData.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java index 9d1332d..3e51bdb 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java +++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java @@ -124,10 +124,14 @@ public class CMSetupWizardData extends AbstractSetupData { private void showHideSimMissingPage() { SimCardMissingPage simCardMissingPage = (SimCardMissingPage) getPage(SimCardMissingPage.TAG); - if (simCardMissingPage != null && isSimInserted()) { - simCardMissingPage.setHidden(true); - if (isCurrentPage(simCardMissingPage)) { - onNextPage(); + if (simCardMissingPage != null) { + if (isSimInserted()) { + simCardMissingPage.setHidden(true); + if (isCurrentPage(simCardMissingPage)) { + onNextPage(); + } + } else { + simCardMissingPage.setHidden(false); } } } @@ -183,7 +187,8 @@ public class CMSetupWizardData extends AbstractSetupData { continue; } if (state != TelephonyManager.SIM_STATE_ABSENT - && state != TelephonyManager.SIM_STATE_UNKNOWN) { + && state != TelephonyManager.SIM_STATE_UNKNOWN + && state != TelephonyManager.SIM_STATE_NOT_READY) { return true; } }