From 22c88405261e9757edbdecbf0ea8d5786fcf1353 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksandermj@google.com>
Date: Wed, 12 Feb 2025 16:57:45 +0000
Subject: [PATCH] Return DISABLED_FOR_USER in deviceinfo/simstatus availability
 if not admin user

The correct return when checking for the SIM status field availability
for non-admin users is DISABLED_FOR_USER.

UNSUPPORTED_ON_DEVICE should only be used when the setting is
unconditionally hidden as the device does not support the feature.

Bug: 395714454
Flag: EXEMPT bugfix
Test: atest SimStatusPreferenceControllerTest

Change-Id: I9bd290f1bdd73909be383a24f2c762d295089ff6
---
 .../deviceinfo/simstatus/SimStatusPreferenceController.java     | 2 +-
 .../deviceinfo/simstatus/SimStatusPreferenceControllerTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
index 7d13b2e9d4b..6431c5a1317 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
@@ -79,7 +79,7 @@ public class SimStatusPreferenceController extends BasePreferenceController {
             return UNSUPPORTED_ON_DEVICE;
         }
         if (!mContext.getSystemService(UserManager.class).isAdminUser()) {
-            return CONDITIONALLY_UNAVAILABLE;
+            return DISABLED_FOR_USER;
         }
         return AVAILABLE;
     }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
index a3ea4645a6e..54c10b46b40 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
@@ -251,7 +251,7 @@ public class SimStatusPreferenceControllerTest {
 
         when(mUserManager.isAdminUser()).thenReturn(false);
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+                BasePreferenceController.DISABLED_FOR_USER);
     }
 
     private <T> void mockService(String serviceName, Class<T> serviceClass, T service) {