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

Merge "Speed up BasePreferenceController.updateNonIndexableKeys" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-08-06 03:13:17 +00:00
committed by Android (Google) Code Review
parent 2a8c60ff6f a7c152816d
commit 8140e7f2b6
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/core/BasePreferenceController.java
View File

@@ -263,6 +263,16 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
|| availabilityStatus == DISABLED_DEPENDENT_SETTING); || availabilityStatus == DISABLED_DEPENDENT_SETTING);
} }
private boolean isAvailableForSearch() {
if (mIsForWork && mWorkProfileUser == null) {
return false;
}
final int availabilityStatus = getAvailabilityStatus();
return (availabilityStatus == AVAILABLE
|| availabilityStatus == DISABLED_DEPENDENT_SETTING);
}
/** /**
* @return {@code false} if the setting is not applicable to the device. This covers both * @return {@code false} if the setting is not applicable to the device. This covers both
* settings which were only introduced in future versions of android, or settings that have * settings which were only introduced in future versions of android, or settings that have
@@ -303,18 +313,12 @@ public abstract class BasePreferenceController extends AbstractPreferenceControl
* Called by SearchIndexProvider#getNonIndexableKeys * Called by SearchIndexProvider#getNonIndexableKeys
*/ */
public void updateNonIndexableKeys(List<String> keys) { public void updateNonIndexableKeys(List<String> keys) {
final boolean shouldSuppressFromSearch = !isAvailable()
|| getAvailabilityStatus() == AVAILABLE_UNSEARCHABLE;
if (shouldSuppressFromSearch) {
final String key = getPreferenceKey(); final String key = getPreferenceKey();
if (TextUtils.isEmpty(key)) { if (TextUtils.isEmpty(key)) {
Log.w(TAG, "Skipping updateNonIndexableKeys due to empty key " + toString()); Log.w(TAG, "Skipping updateNonIndexableKeys due to empty key " + this);
return;
}
if (keys.contains(key)) {
Log.w(TAG, "Skipping updateNonIndexableKeys, key already in list. " + toString());
return; return;
} }
if (!keys.contains(key) && !isAvailableForSearch()) {
keys.add(key); keys.add(key);
} }
} }