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

Return UNSUPPORTED_ON_DEVICE in network/imei when no telephony

Browse Source 
If the device does not have any telephony support (either via the
build-time config_show_sim_info=false boolean flag, or when not
declaring the PackageManager.FEATURE_TELEPHONY_DATA feature flag),
returning UNSUPPORTED_ON_DEVICE makes more sense than
CONDITIONALLY_UNAVAILABLE, as there is no runtime change that would
make it available.

This change also aligns the behavior with the deviceinfo/imei
entry.

Bug: 395714454
Flag: EXEMPT bugfix
Test: atest MobileNetworkImeiPreferenceControllerTest
Change-Id: Ia01cf3812f8343eabd8ea6970b691ac71432e8bd
This commit is contained in:
Aleksander Morgado
2025-02-12 14:19:47 +00:00
parent dc86669298
commit 2a0ad1efdf
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt
View File

@@ -64,12 +64,12 @@ class MobileNetworkImeiPreferenceController(context: Context, key: String) :
} }
override fun getAvailabilityStatus(subId: Int): Int = when { override fun getAvailabilityStatus(subId: Int): Int = when {
!Flags.isDualSimOnboardingEnabled() -> CONDITIONALLY_UNAVAILABLE !SubscriptionUtil.isSimHardwareVisible(mContext)
SubscriptionManager.isValidSubscriptionId(subId) || Utils.isWifiOnly(mContext) -> UNSUPPORTED_ON_DEVICE
&& SubscriptionUtil.isSimHardwareVisible(mContext) !Flags.isDualSimOnboardingEnabled()
&& mContext.userManager.isAdminUser || !SubscriptionManager.isValidSubscriptionId(subId)
&& !Utils.isWifiOnly(mContext) -> AVAILABLE || !mContext.userManager.isAdminUser -> CONDITIONALLY_UNAVAILABLE
else -> CONDITIONALLY_UNAVAILABLE else -> AVAILABLE
} }
override fun displayPreference(screen: PreferenceScreen) { override fun displayPreference(screen: PreferenceScreen) {

4
tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceControllerTest.kt
View File

@@ -176,7 +176,7 @@ class MobileNetworkImeiPreferenceControllerTest {
whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(false) whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(false)
val availabilityStatus = controller.availabilityStatus val availabilityStatus = controller.availabilityStatus
assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE)
} }
@Test @Test
@@ -196,7 +196,7 @@ class MobileNetworkImeiPreferenceControllerTest {
whenever(Utils.isWifiOnly(context)).thenReturn(true) whenever(Utils.isWifiOnly(context)).thenReturn(true)
val availabilityStatus = controller.availabilityStatus val availabilityStatus = controller.availabilityStatus
assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE) assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE)
} }
private companion object { private companion object {