Disable ChooseDataSimActivity if single SIM detected

Change-Id: I963a7b4f268698c048cf0eccb15198412b3e2ab3
This commit is contained in:
Oliver Scott
2021-08-24 14:52:10 -04:00
committed by Timi Rautamäki
parent 1167c047be
commit 7e04f9c361
3 changed files with 11 additions and 1 deletions

View File

@@ -71,6 +71,8 @@ public class SimMissingActivity extends BaseSetupWizardActivity {
if (mPhoneMonitor.simMissing()) {
SetupWizardUtils.disableComponent(this, ChooseDataSimActivity.class);
SetupWizardUtils.disableComponent(this, MobileDataActivity.class);
} else if (!mPhoneMonitor.isMultiSimDevice() || mPhoneMonitor.singleSimInserted()) {
SetupWizardUtils.disableComponent(this, ChooseDataSimActivity.class);
}
super.onNavigateNext();
}

View File

@@ -289,6 +289,10 @@ public class PhoneMonitor {
return true;
}
public boolean singleSimInserted() {
return mSubscriptionManager.getActiveSubscriptionInfoCount() == 1;
}
// We only care that each slot has a sim
public boolean allSimsInserted() {
int simSlotCount = mTelephony.getSimCount();

View File

@@ -275,6 +275,10 @@ public class SetupWizardUtils {
return PhoneMonitor.getInstance().simMissing();
}
public static boolean singleSimInserted() {
return PhoneMonitor.getInstance().singleSimInserted();
}
public static boolean isMultiSimDevice() {
return PhoneMonitor.getInstance().isMultiSimDevice();
}
@@ -293,7 +297,7 @@ public class SetupWizardUtils {
} else if (!simMissing()) {
disableComponent(context, SimMissingActivity.class);
}
if (!isMultiSimDevice()) {
if (!isMultiSimDevice() || singleSimInserted()) {
disableComponent(context, ChooseDataSimActivity.class);
}
if (!SetupWizardUtils.hasWifi(context) ||