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

Merge "Fix Crash due to runtime exception from CarrierManager" into main

Browse Source
This commit is contained in:
Tom Hsu
2024-05-29 06:38:30 +00:00
committed by Android (Google) Code Review
parent 49abe4c03d a5f3d46539
commit c3e9cd5969
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/telephony/CarrierConfigManagerExt.kt
View File

@@ -36,4 +36,7 @@ fun CarrierConfigManager.safeGetConfig(
// Settings should not assume Carrier config loader (and any other system services as well) are
// always available. If not available, use default value instead.
persistableBundleOf()
} catch (e: RuntimeException) {
// The reason is same with above.
persistableBundleOf()
}

23
tests/spa_unit/src/com/android/settings/system/ClientInitiatedActionRepositoryTest.kt
View File

@@ -27,6 +27,7 @@ import org.junit.runner.RunWith
import org.mockito.kotlin.any
import org.mockito.kotlin.argumentCaptor
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.doThrow
import org.mockito.kotlin.mock
import org.mockito.kotlin.never
import org.mockito.kotlin.stub
@@ -43,6 +44,28 @@ class ClientInitiatedActionRepositoryTest {
private val repository = ClientInitiatedActionRepository(context)
@Test
fun onSystemUpdate_runtimeException_doNothing() {
mockCarrierConfigManager.stub {
on { getConfigForSubId(any(), any()) } doThrow(RuntimeException())
}
repository.onSystemUpdate()
verify(context, never()).sendBroadcast(any())
}
@Test
fun onSystemUpdate_illegalStateException_doNothing() {
mockCarrierConfigManager.stub {
on { getConfigForSubId(any(), any()) } doThrow(IllegalStateException())
}
repository.onSystemUpdate()
verify(context, never()).sendBroadcast(any())
}
@Test
fun onSystemUpdate_notEnabled() {
mockCarrierConfigManager.stub {