PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the error dialogs

Browse Source 
When system activate the sim faild, then it shows the error dialog

Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: manual test, verify the error dialog UI
Change-Id: I90d7aa5d3f3ad36d949a505377466f8cdf63b6b4
This commit is contained in:
songferngwang
2024-02-29 09:12:03 +00:00
committed by SongFerng Wang
parent c59c3a3d4f
commit a9695c40e7
3 changed files with 100 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/network/SimOnboardingService.kt
View File

@@ -23,6 +23,7 @@ import android.telephony.TelephonyManager
import android.telephony.UiccCardInfo
import android.telephony.UiccSlotInfo
import android.util.Log
import com.android.settings.network.SimOnboardingActivity.Companion.CallbackType
import com.android.settings.spa.network.setAutomaticData
import com.android.settings.spa.network.setDefaultData
import com.android.settings.spa.network.setDefaultSms
@@ -31,7 +32,6 @@ import com.android.settingslib.utils.ThreadUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
private const val TAG = "SimOnboardingService"
private const val INVALID = SubscriptionManager.INVALID_SUBSCRIPTION_ID
@@ -60,7 +60,7 @@ class SimOnboardingService {
.map { it.subscriptionId }
.firstOrNull() ?: SubscriptionManager.INVALID_SUBSCRIPTION_ID
}
var callback: (Int) -> Unit = {}
var callback: (CallbackType) -> Unit = {}
var isMultipleEnabledProfilesSupported: Boolean = false
get() {
@@ -135,7 +135,9 @@ class SimOnboardingService {
userSelectedSubInfoList.clear()
}
fun initData(inputTargetSubId:Int,context: Context, callback: (Int) -> Unit) {
fun initData(inputTargetSubId: Int,
context: Context,
callback: (CallbackType) -> Unit) {
this.callback = callback
targetSubId = inputTargetSubId
subscriptionManager = context.getSystemService(SubscriptionManager::class.java)
@@ -261,7 +263,7 @@ class SimOnboardingService {
fun startActivatingSim(){
// TODO: start to activate sim
callback(SimOnboardingActivity.CALLBACK_FINISH)
callback(CallbackType.CALLBACK_FINISH)
}
suspend fun startSetupName() {
@@ -273,7 +275,7 @@ class SimOnboardingService {
)
}
// next action is SETUP_PRIMARY_SIM
callback(SimOnboardingActivity.CALLBACK_SETUP_PRIMARY_SIM)
callback(CallbackType.CALLBACK_SETUP_PRIMARY_SIM)
}
}
@@ -302,7 +304,7 @@ class SimOnboardingService {
}
// no next action, send finish
callback(SimOnboardingActivity.CALLBACK_FINISH)
callback(CallbackType.CALLBACK_FINISH)
}
}
}