Merge "Fix the primary sim setup after the psim enabled" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
f1c9cb8fec
@@ -338,11 +338,6 @@ class SimOnboardingService {
|
|||||||
|
|
||||||
suspend fun startSetupPrimarySim(context: Context) {
|
suspend fun startSetupPrimarySim(context: Context) {
|
||||||
withContext(Dispatchers.Default) {
|
withContext(Dispatchers.Default) {
|
||||||
if (SubscriptionUtil.getActiveSubscriptions(subscriptionManager).size <= 1) {
|
|
||||||
Log.d(TAG,
|
|
||||||
"startSetupPrimarySim: number of active subscriptionInfo is less than 2"
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
setDefaultVoice(subscriptionManager, targetPrimarySimCalls)
|
setDefaultVoice(subscriptionManager, targetPrimarySimCalls)
|
||||||
setDefaultSms(subscriptionManager, targetPrimarySimTexts)
|
setDefaultSms(subscriptionManager, targetPrimarySimTexts)
|
||||||
setDefaultData(
|
setDefaultData(
|
||||||
@@ -359,7 +354,6 @@ class SimOnboardingService {
|
|||||||
// no next action, send finish
|
// no next action, send finish
|
||||||
callback(CallbackType.CALLBACK_FINISH)
|
callback(CallbackType.CALLBACK_FINISH)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun startEnableDsds(context: Context) {
|
suspend fun startEnableDsds(context: Context) {
|
||||||
withContext(Dispatchers.Default) {
|
withContext(Dispatchers.Default) {
|
||||||
|
Reference in New Issue
Block a user