commit b731e6309659843f6c5510dd6c2061062705370b
author Chaohui Wang <chaohuiw@google.com> Fri Nov 17 15:15:16 2023 +0800
committer Chaohui Wang <chaohuiw@google.com> Mon Dec 04 10:10:29 2023 +0000
tree a3e46bdfe55f152f9f47e593e47b87273172b756
parent d3cc9b20e464d735573032a87b40495ba84e9805

Check isSimHardwareVisible earlier

In SimEidPreferenceController, to reduce flaky on no SIM devices.

Bug: 304560734
Test: manual - on "About phone / tablet" page
Test: unit test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8b7e6c28bcef0788b4fc637af16dcaef32a16c14)
Merged-In: I07ae9b785d0fbe24a866883080a466a2110ca68f
Change-Id: I07ae9b785d0fbe24a866883080a466a2110ca68f

src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt

diff --git a/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt b/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
index a390a27..996f31f 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
+++ b/src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
@@ -59,11 +59,13 @@
     }
 
     /**
-     * Returns available here, but UI availability is retrieved asynchronously later.
+     * Returns available here, if SIM hardware is visible.
      *
-     * Check [updateNonIndexableKeys] for search availability.
+     * Also check [getIsAvailableAndUpdateEid] for other availability check which retrieved
+     * asynchronously later.
      */
-    override fun getAvailabilityStatus() = AVAILABLE
+    override fun getAvailabilityStatus() =
+        if (SubscriptionUtil.isSimHardwareVisible(mContext)) AVAILABLE else UNSUPPORTED_ON_DEVICE
 
     override fun displayPreference(screen: PreferenceScreen) {
         super.displayPreference(screen)
@@ -95,12 +97,7 @@
     }
 
     private fun getIsAvailableAndUpdateEid(): Boolean {
-        if (!SubscriptionUtil.isSimHardwareVisible(mContext) ||
-            !mContext.userManager.isAdminUser ||
-            Utils.isWifiOnly(mContext)
-        ) {
-            return false
-        }
+        if (!mContext.userManager.isAdminUser || Utils.isWifiOnly(mContext)) return false
         eid = eidStatus?.eid ?: ""
         return eid.isNotEmpty()
     }
@@ -147,8 +144,8 @@
     }
 
     override fun updateNonIndexableKeys(keys: MutableList<String>) {
-        if (!getIsAvailableAndUpdateEid()) {
-            keys.add(preferenceKey)
+        if (!isAvailable() || !getIsAvailableAndUpdateEid()) {
+            keys += preferenceKey
         }
     }