am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev

* commit '526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7': Disable factory reset for secondary users
2014-10-23 22:10:38 +00:00
parent f62af38266 526e4b4155
commit 0e64404a94
3 changed files with 59 additions and 4 deletions
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -232,7 +232,7 @@ public final class SearchIndexableResources {
        sResMap.put(PrivacySettings.class.getName(),
                new SearchIndexableResource(
                        Ranking.getRankForClassName(PrivacySettings.class.getName()),
-                        R.xml.privacy_settings,
+                        NO_DATA_RES_ID,
                        PrivacySettings.class.getName(),
                        R.drawable.ic_settings_backup));