SetupWizard: Tweak logic for showing/hiding sim missing page

CYNGNOS-1021

Change-Id: I6139ca4368eb1bf49b07a95ac60ca28831e2cd3a
This commit is contained in:
cretin45 2015-09-17 13:48:55 -07:00
parent fa1be773ce
commit edaab88f13
1 changed files with 10 additions and 5 deletions

View File

@ -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;
}
}