Merge "Implements queryNonIndexableKeys for Settings"

2017-01-26 01:10:15 +00:00
parent 6db21b4668 2108f91fe6
commit f75b651874
5 changed files with 129 additions and 5 deletions
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -88,7 +88,8 @@ public final class SearchIndexableResources {
    @XmlRes
    public static final int NO_DATA_RES_ID = 0;

-    private static final HashMap<String, SearchIndexableResource> sResMap = new HashMap<>();
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    static final HashMap<String, SearchIndexableResource> sResMap = new HashMap<>();

    @VisibleForTesting
    static void addIndex(Class<?> indexClass, @XmlRes int xmlResId,