Merge changes from topic "settings-visibility-return-fixes" into main

* changes:
  Return DISABLED_FOR_USER in deviceinfo/simstatus availability if not admin user
  Return UNSUPPORTED_ON_DEVICE in deviceinfo/simstatus when no telephony
  Added unit tests for SimStatusPreferenceController visibility
  Return DISABLED_FOR_USER in IMEI availability if not admin user
  Return UNSUPPORTED_ON_DEVICE in network/imei when no telephony
  Added unit test for MobileNetworkImeiPreferenceController visibility
  Added unit tests for ImeiInfoPreferenceController visibility
  Return UNSUPPORTED_ON_DEVICE in network/phonenumber when no telephony

src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java

@@ -132,10 +132,13 @@ public class ImeiInfoPreferenceController extends BasePreferenceController {
 
     @Override
     public int getAvailabilityStatus() {
-        boolean isAvailable = SubscriptionUtil.isSimHardwareVisible(mContext) &&
+        if (!SubscriptionUtil.isSimHardwareVisible(mContext) || Utils.isWifiOnly(mContext)) {
-                mContext.getSystemService(UserManager.class).isAdminUser() &&
+            return UNSUPPORTED_ON_DEVICE;
-                !Utils.isWifiOnly(mContext);
+        }
-        return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        if (!mContext.getSystemService(UserManager.class).isAdminUser()) {
+            return DISABLED_FOR_USER;
+        }
+        return AVAILABLE;
     }
 
     @Override

src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java

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

src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt

@@ -64,12 +64,12 @@ class MobileNetworkImeiPreferenceController(context: Context, key: String) :
     }
 
     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) -> CONDITIONALLY_UNAVAILABLE
-                && !Utils.isWifiOnly(mContext) -> AVAILABLE
+        !mContext.userManager.isAdminUser -> DISABLED_FOR_USER
-        else -> CONDITIONALLY_UNAVAILABLE
+        else -> AVAILABLE
     }
 
     override fun displayPreference(screen: PreferenceScreen) {

src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceController.kt

@@ -44,10 +44,10 @@ constructor(
     }
 
     override fun getAvailabilityStatus(subId: Int): Int = when {
+        !SubscriptionUtil.isSimHardwareVisible(mContext)
+            || Utils.isWifiOnly(mContext) -> UNSUPPORTED_ON_DEVICE
         !Flags.isDualSimOnboardingEnabled()
-            || !SubscriptionManager.isValidSubscriptionId(subId)
+            || !SubscriptionManager.isValidSubscriptionId(subId) -> CONDITIONALLY_UNAVAILABLE
-            || !SubscriptionUtil.isSimHardwareVisible(mContext)
-            || Utils.isWifiOnly(mContext) -> CONDITIONALLY_UNAVAILABLE
         !mContext.userManager.isAdminUser -> DISABLED_FOR_USER
         else -> AVAILABLE
     }

tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java

@@ -20,7 +20,7 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
 import static android.telephony.TelephonyManager.PHONE_TYPE_GSM;
 import static android.telephony.TelephonyManager.PHONE_TYPE_NONE;
 
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.anyInt;
@@ -43,6 +43,7 @@ import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deviceinfo.simstatus.SlotSimStatus;
 
 import org.junit.Before;
@@ -90,11 +91,15 @@ public class ImeiInfoPreferenceControllerTest {
 
         mResources = spy(mContext.getResources());
         when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
 
         mockService(Context.TELEPHONY_SERVICE, TelephonyManager.class, mTelephonyManager);
         mockService(Context.USER_SERVICE, UserManager.class, mUserManager);
 
+        // Availability defaults
+        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
+        when(mTelephonyManager.isDataCapable()).thenReturn(true);
+        when(mUserManager.isAdminUser()).thenReturn(true);
+
         when(mScreen.getContext()).thenReturn(mContext);
         final String categoryKey = "device_detail_category";
         when(mScreen.findPreference(categoryKey)).thenReturn(mCategory);
@@ -109,7 +114,6 @@ public class ImeiInfoPreferenceControllerTest {
                     }
                 });
         controller.init(mFragment, slotSimStatus);
-        doReturn(AVAILABLE).when(controller).getAvailabilityStatus();
         doReturn(preference).when(controller).createNewPreference(mContext);
 
         when(mScreen.findPreference(key)).thenReturn(preference);
@@ -228,6 +232,42 @@ public class ImeiInfoPreferenceControllerTest {
         verify(mFragment).getChildFragmentManager();
     }
 
+    @Test
+    public void getAvailabilityStatus_showSimInfo_telephonyDataCapable_userAdmindisplayed() {
+        setupPhoneCount(1, PHONE_TYPE_GSM, PHONE_TYPE_NONE);
+
+        // Use defaults
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_notShowSimInfo_telephonyDataCapable_userAdmin_notDisplayed() {
+        setupPhoneCount(1, PHONE_TYPE_GSM, PHONE_TYPE_NONE);
+
+        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_showSimInfo_notTelephonyDataCapable_userAdmin_notDisplayed() {
+        setupPhoneCount(1, PHONE_TYPE_GSM, PHONE_TYPE_NONE);
+
+        when(mTelephonyManager.isDataCapable()).thenReturn(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_showSimInfo_telephonyDataCapable_notUserAdmin_notDisplayed() {
+        setupPhoneCount(1, PHONE_TYPE_GSM, PHONE_TYPE_NONE);
+
+        when(mUserManager.isAdminUser()).thenReturn(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.DISABLED_FOR_USER);
+    }
+
     private <T> void mockService(String serviceName, Class<T> serviceClass, T service) {
         when(mContext.getSystemServiceName(serviceClass)).thenReturn(serviceName);
         when(mContext.getSystemService(serviceName)).thenReturn(service);

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

@@ -44,9 +44,6 @@ import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.search.SearchIndexableRaw;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -57,6 +54,9 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 public class SimStatusPreferenceControllerTest {
 
@@ -93,7 +93,6 @@ public class SimStatusPreferenceControllerTest {
 
         mResources = spy(mContext.getResources());
         when(mContext.getResources()).thenReturn(mResources);
-        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
 
         mockService(Context.TELEPHONY_SERVICE, TelephonyManager.class, mTelephonyManager);
         mockService(Context.TELEPHONY_SUBSCRIPTION_SERVICE, SubscriptionManager.class,
@@ -114,7 +113,12 @@ public class SimStatusPreferenceControllerTest {
                 return 0;
             }
         });
-        doReturn(BasePreferenceController.AVAILABLE).when(mController).getAvailabilityStatus();
+
+        // Availability defaults
+        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true);
+        when(mTelephonyManager.isDataCapable()).thenReturn(true);
+        when(mUserManager.isAdminUser()).thenReturn(true);
+
         when(mScreen.getContext()).thenReturn(mContext);
         final String categoryKey = "device_detail_category";
         when(mScreen.findPreference(categoryKey)).thenReturn(mCategory);
@@ -210,6 +214,46 @@ public class SimStatusPreferenceControllerTest {
         assertThat(rawData.size()).isEqualTo(1);
     }
 
+    @Test
+    public void getAvailabilityStatus_showSimInfo_telephonyDataCapable_userAdmindisplayed() {
+        SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
+        mController.init(mFragment, slotSimStatus);
+
+        // Use defaults
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_notShowSimInfo_telephonyDataCapable_userAdmin_notDisplayed() {
+        SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
+        mController.init(mFragment, slotSimStatus);
+
+        when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_showSimInfo_notTelephonyDataCapable_userAdmin_notDisplayed() {
+        SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
+        mController.init(mFragment, slotSimStatus);
+
+        when(mTelephonyManager.isDataCapable()).thenReturn(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_showSimInfo_telephonyDataCapable_notUserAdmin_notDisplayed() {
+        SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
+        mController.init(mFragment, slotSimStatus);
+
+        when(mUserManager.isAdminUser()).thenReturn(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.DISABLED_FOR_USER);
+    }
+
     private <T> void mockService(String serviceName, Class<T> serviceClass, T service) {
         when(mContext.getSystemServiceName(serviceClass)).thenReturn(serviceName);
         when(mContext.getSystemService(serviceName)).thenReturn(service);

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

@@ -17,6 +17,7 @@
 package com.android.settings.network.telephony
 
 import android.content.Context
+import android.os.UserManager
 import android.telephony.SubscriptionInfo
 import android.telephony.TelephonyManager
 import androidx.fragment.app.Fragment
@@ -29,6 +30,7 @@ import com.android.settings.R
 import com.android.settings.core.BasePreferenceController
 import com.android.settings.network.SubscriptionInfoListViewModel
 import com.android.settings.network.SubscriptionUtil
+import com.android.settingslib.Utils
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.runBlocking
 import org.junit.After
@@ -48,6 +50,8 @@ import org.mockito.quality.Strictness
 class MobileNetworkImeiPreferenceControllerTest {
     private lateinit var mockSession: MockitoSession
 
+    private val mockUserManager = mock<UserManager>()
+
     private val mockViewModels =  mock<Lazy<SubscriptionInfoListViewModel>>()
     private val mockFragment = mock<Fragment>{
         val viewmodel = mockViewModels
@@ -66,6 +70,7 @@ class MobileNetworkImeiPreferenceControllerTest {
 
     private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
         on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
+        on { getSystemService(UserManager::class.java) } doReturn mockUserManager
     }
 
     private val controller = MobileNetworkImeiPreferenceController(context, TEST_KEY)
@@ -77,9 +82,17 @@ class MobileNetworkImeiPreferenceControllerTest {
         mockSession = ExtendedMockito.mockitoSession()
             .initMocks(this)
             .mockStatic(SubscriptionUtil::class.java)
+            .mockStatic(Utils::class.java)
             .strictness(Strictness.LENIENT)
             .startMocking()
 
+        // By default, available
+        whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(true)
+        whenever(Utils.isWifiOnly(context)).thenReturn(false)
+        mockUserManager.stub {
+            on { isAdminUser } doReturn true
+        }
+
         preferenceScreen.addPreference(preference)
         controller.displayPreference(preferenceScreen)
     }
@@ -91,15 +104,13 @@ class MobileNetworkImeiPreferenceControllerTest {
 
     @Test
     fun refreshData_getImei_preferenceSummaryIsExpected() = runBlocking {
-        whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(true)
         whenever(SubscriptionUtil.getActiveSubscriptions(any())).thenReturn(
             listOf(
                 SUB_INFO_1,
                 SUB_INFO_2
             )
         )
-        var mockSubId = 2
+        controller.init(mockFragment, SUB_ID_1)
-        controller.init(mockFragment, mockSubId)
         mockImei = "test imei"
         mockTelephonyManager.stub {
             on { imei } doReturn mockImei
@@ -112,15 +123,13 @@ class MobileNetworkImeiPreferenceControllerTest {
 
     @Test
     fun refreshData_getImeiTitle_showImei() = runBlocking {
-        whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(true)
         whenever(SubscriptionUtil.getActiveSubscriptions(any())).thenReturn(
             listOf(
                 SUB_INFO_1,
                 SUB_INFO_2
             )
         )
-        var mockSubId = 2
+        controller.init(mockFragment, SUB_ID_2)
-        controller.init(mockFragment, mockSubId)
         mockImei = "test imei"
         mockTelephonyManager.stub {
             on { imei } doReturn mockImei
@@ -134,15 +143,13 @@ class MobileNetworkImeiPreferenceControllerTest {
 
     @Test
     fun refreshData_getPrimaryImeiTitle_showPrimaryImei() = runBlocking {
-        whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(true)
         whenever(SubscriptionUtil.getActiveSubscriptions(any())).thenReturn(
             listOf(
                 SUB_INFO_1,
                 SUB_INFO_2
             )
         )
-        var mockSubId = 2
+        controller.init(mockFragment, SUB_ID_2)
-        controller.init(mockFragment, mockSubId)
         mockImei = "test imei"
         mockTelephonyManager.stub {
             on { imei } doReturn mockImei
@@ -155,26 +162,57 @@ class MobileNetworkImeiPreferenceControllerTest {
     }
 
     @Test
-    fun getAvailabilityStatus_notSimHardwareVisible() {
+    fun getAvailabilityStatus_simHardwareVisible_userAdmin_notWifiOnly_displayed() {
+        controller.init(mockFragment, SUB_ID_1)
+
+        // Use defaults from setup()
+        val availabilityStatus = controller.availabilityStatus
+        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.AVAILABLE)
+    }
+
+    @Test
+    fun getAvailabilityStatus_notSimHardwareVisible_userAdmin_notWifiOnly_notDisplayed() {
+        controller.init(mockFragment, SUB_ID_1)
         whenever(SubscriptionUtil.isSimHardwareVisible(context)).thenReturn(false)
 
         val availabilityStatus = controller.availabilityStatus
+        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE)
+    }
 
-        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE)
+    @Test
+    fun getAvailabilityStatus_simHardwareVisible_notUserAdmin_notWifiOnly_notDisplayed() {
+        controller.init(mockFragment, SUB_ID_1)
+        mockUserManager.stub {
+            on { isAdminUser } doReturn false
+        }
+
+        val availabilityStatus = controller.availabilityStatus
+        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.DISABLED_FOR_USER)
+    }
+
+    @Test
+    fun getAvailabilityStatus_simHardwareVisible_userAdmin_wifiOnly_notDisplayed() {
+        controller.init(mockFragment, SUB_ID_1)
+        whenever(Utils.isWifiOnly(context)).thenReturn(true)
+
+        val availabilityStatus = controller.availabilityStatus
+        assertThat(availabilityStatus).isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE)
     }
 
     private companion object {
         const val TEST_KEY = "test_key"
+        const val SUB_ID_1 = 1
+        const val SUB_ID_2 = 2
         const val DISPLAY_NAME_1 = "Sub 1"
         const val DISPLAY_NAME_2 = "Sub 2"
 
         val SUB_INFO_1: SubscriptionInfo = SubscriptionInfo.Builder().apply {
-            setId(1)
+            setId(SUB_ID_1)
             setDisplayName(DISPLAY_NAME_1)
         }.build()
 
         val SUB_INFO_2: SubscriptionInfo = SubscriptionInfo.Builder().apply {
-            setId(2)
+            setId(SUB_ID_2)
             setDisplayName(DISPLAY_NAME_2)
         }.build()
 

tests/spa_unit/src/com/android/settings/network/telephony/MobileNetworkPhoneNumberPreferenceControllerTest.kt

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