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

Check isSimHardwareVisible earlier

Browse Source 
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
This commit is contained in:
Chaohui Wang
2023-11-17 15:15:16 +08:00
parent d3cc9b20e4
commit b731e63096
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/deviceinfo/simstatus/SimEidPreferenceController.kt
View File

@@ -59,11 +59,13 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) :
} }
/** /**
* 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) { override fun displayPreference(screen: PreferenceScreen) {
super.displayPreference(screen) super.displayPreference(screen)
@@ -95,12 +97,7 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) :
} }
private fun getIsAvailableAndUpdateEid(): Boolean { private fun getIsAvailableAndUpdateEid(): Boolean {
if (!SubscriptionUtil.isSimHardwareVisible(mContext) || if (!mContext.userManager.isAdminUser || Utils.isWifiOnly(mContext)) return false
!mContext.userManager.isAdminUser ||
Utils.isWifiOnly(mContext)
) {
return false
}
eid = eidStatus?.eid ?: "" eid = eidStatus?.eid ?: ""
return eid.isNotEmpty() return eid.isNotEmpty()
} }
@@ -147,8 +144,8 @@ class SimEidPreferenceController(context: Context, preferenceKey: String) :
} }
override fun updateNonIndexableKeys(keys: MutableList<String>) { override fun updateNonIndexableKeys(keys: MutableList<String>) {
if (!getIsAvailableAndUpdateEid()) { if (!isAvailable() || !getIsAvailableAndUpdateEid()) {
keys.add(preferenceKey) keys += preferenceKey
} }
} }