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

Return UNSUPPORTED_ON_DEVICE in deviceinfo/simstatus 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.

Bug: 395714454
Flag: EXEMPT bugfix
Test: atest SimStatusPreferenceControllerTest
Change-Id: I0735c949a590190cdc177cbca835444691c50faa
This commit is contained in:
Aleksander Morgado
2025-02-12 16:46:53 +00:00
parent 4cc14d6553
commit d58d0be2e1
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
View File

@@ -37,7 +37,6 @@ import com.android.settings.network.SubscriptionUtil;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexableRaw;
import java.util.ArrayList;
import java.util.List; import java.util.List;
public class SimStatusPreferenceController extends BasePreferenceController { public class SimStatusPreferenceController extends BasePreferenceController {
@@ -74,13 +73,15 @@ public class SimStatusPreferenceController extends BasePreferenceController {
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (getSimSlotIndex() == SubscriptionManager.INVALID_SIM_SLOT_INDEX) { if (!SubscriptionUtil.isSimHardwareVisible(mContext)
|| Utils.isWifiOnly(mContext)
|| getSimSlotIndex() == SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
} }
boolean isAvailable = SubscriptionUtil.isSimHardwareVisible(mContext) && if (!mContext.getSystemService(UserManager.class).isAdminUser()) {
mContext.getSystemService(UserManager.class).isAdminUser() && return CONDITIONALLY_UNAVAILABLE;
!Utils.isWifiOnly(mContext); }
return isAvailable ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; return AVAILABLE;
} }
@Override @Override

4
tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
View File

@@ -231,7 +231,7 @@ public class SimStatusPreferenceControllerTest {
when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false); when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo( assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.CONDITIONALLY_UNAVAILABLE); BasePreferenceController.UNSUPPORTED_ON_DEVICE);
} }
@Test @Test
@@ -241,7 +241,7 @@ public class SimStatusPreferenceControllerTest {
when(mTelephonyManager.isDataCapable()).thenReturn(false); when(mTelephonyManager.isDataCapable()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo( assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.CONDITIONALLY_UNAVAILABLE); BasePreferenceController.UNSUPPORTED_ON_DEVICE);
} }
@Test @Test