Merge "Fix crash issues in About Phone settings" into main (b3d75a2e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/imei/ImeiPreference.kt

+9 −4

Original line number	Diff line number	Diff line
		@@ -84,10 +84,15 @@ class ImeiPreference(
		if (activeModemCount <= 1) {
		getString(R.string.status_imei)
		} else {
		val isPrimary = imei == telephonyManager?.primaryImei
		try {
		val titleId =
		if (isPrimary) R.string.imei_multi_sim_primary else R.string.imei_multi_sim
		if (imei == telephonyManager?.primaryImei) R.string.imei_multi_sim_primary
		else R.string.imei_multi_sim
		getString(titleId, slotIndex + 1)
		} catch (exception: Exception) {
		Log.e(TAG, "PrimaryImei not available.", exception)
		getString(R.string.imei_multi_sim, slotIndex + 1)
		}
		}

		companion object {

+10 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.doThrow
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.stub

		@@ -60,6 +61,15 @@ class ImeiPreferenceTest {
		preference = ImeiPreference(context, 0, 1)
		}

		@Test
		fun init_getPrimaryImeiThrowException_doNotCrash() {
		mockTelephonyManager.stub {
		on { primaryImei } doThrow(IllegalStateException())
		}

		preference = ImeiPreference(context, 0, 2)
		}

		@Test
		fun getKey_slotIndex0_returnImeiWithIndex() {
		assertThat(preference.key).isEqualTo(ImeiPreference.KEY_PREFIX + "1")