diff options
author | Stanley Wang <stanleytfwang@google.com> | 2020-05-20 20:55:11 +0800 |
---|---|---|
committer | Stanley Wang <stanleytfwang@google.com> | 2020-06-09 17:48:43 +0800 |
commit | d1a7a5618ef86588c6a5c05ae4604b97c11b755e (patch) | |
tree | 39509312dce20fd2b750a531a0f071d1015061fa /src/com/android/settings/security | |
parent | a44860c880327bb57ac5ad843ffdc5963a55b9cf (diff) | |
download | packages_apps_Settings-d1a7a5618ef86588c6a5c05ae4604b97c11b755e.tar.gz packages_apps_Settings-d1a7a5618ef86588c6a5c05ae4604b97c11b755e.tar.bz2 packages_apps_Settings-d1a7a5618ef86588c6a5c05ae4604b97c11b755e.zip |
Add the "Smart Lock" item to dynamic index.
- The "Smart Lock" item is a trust agent which comes from
TrustAgentManager, so add it to dynamic index.
Fixes: 148867137
Test: manual test the search result and run Settings robotest
Change-Id: I7cd3a9df89a9b9378fa49cc2cb2127c778b795f2
Diffstat (limited to 'src/com/android/settings/security')
-rw-r--r-- | src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java | 61 |
1 files changed, 48 insertions, 13 deletions
diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java index eb50b7c0b3..6067b77e59 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java @@ -44,6 +44,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; +import com.android.settingslib.search.SearchIndexableRaw; import java.util.List; @@ -134,34 +135,68 @@ public class TrustAgentListPreferenceController extends AbstractPreferenceContro updateTrustAgents(); } + + @Override + public void updateDynamicRawDataToIndex(List<SearchIndexableRaw> rawData) { + if (!isAvailable()) { + return; + } + + final List<TrustAgentManager.TrustAgentComponentInfo> agents = getActiveTrustAgents( + mContext); + if (agents == null) { + return; + } + + for (int i = 0, size = agents.size(); i < size; i++) { + final SearchIndexableRaw raw = new SearchIndexableRaw(mContext); + final TrustAgentManager.TrustAgentComponentInfo agent = agents.get(i); + + raw.key = PREF_KEY_TRUST_AGENT + i; + raw.title = agent.title; + rawData.add(raw); + } + } + + /** + * @return The active trust agents from TrustAgentManager. + */ + private List<TrustAgentManager.TrustAgentComponentInfo> getActiveTrustAgents(Context context) { + return mTrustAgentManager.getActiveTrustAgents(context, mLockPatternUtils); + } + private void updateTrustAgents() { if (mSecurityCategory == null) { return; } + // If for some reason the preference is no longer available, don't proceed to add. + if (!isAvailable()) { + return; + } + final List<TrustAgentManager.TrustAgentComponentInfo> agents = getActiveTrustAgents( + mContext); + if (agents == null) { + return; + } + // First remove all old trust agents. - while (true) { - final Preference oldAgent = mSecurityCategory.findPreference(PREF_KEY_TRUST_AGENT); + for (int i = 0, size = agents.size(); i < size; i++) { + String key = PREF_KEY_TRUST_AGENT + i; + final Preference oldAgent = mSecurityCategory.findPreference(key); if (oldAgent == null) { break; } else { mSecurityCategory.removePreference(oldAgent); } } - // If for some reason the preference is no longer available, don't proceed to add. - if (!isAvailable()) { - return; - } + // Then add new ones. final boolean hasSecurity = mLockPatternUtils.isSecure(MY_USER_ID); - final List<TrustAgentManager.TrustAgentComponentInfo> agents = - mTrustAgentManager.getActiveTrustAgents(mContext, mLockPatternUtils); - if (agents == null) { - return; - } - for (TrustAgentManager.TrustAgentComponentInfo agent : agents) { + for (int i = 0, size = agents.size(); i < size; i++) { final RestrictedPreference trustAgentPreference = new RestrictedPreference(mSecurityCategory.getContext()); - trustAgentPreference.setKey(PREF_KEY_TRUST_AGENT); + TrustAgentManager.TrustAgentComponentInfo agent = agents.get(i); + trustAgentPreference.setKey(PREF_KEY_TRUST_AGENT + i); trustAgentPreference.setTitle(agent.title); trustAgentPreference.setSummary(agent.summary); // Create intent for this preference. |