Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check isSimHardwareVisible earlier am: b731e63096

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25498055

Change-Id: I19c7182a8207c48f99bc6730a88c10e839b5e6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2023-12-05 07:12:53 +00:00
committed by Automerger Merge Worker
parent 794f5153ec b731e63096
commit 4cccd18ef8
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
} }
} }