summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/search
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-10-23 22:10:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-23 22:10:38 +0000
commit0e64404a9445c3e073480681d22720240a70f2c1 (patch)
tree79ce017413b5e26678ca465397891ad683204a42 /src/com/android/settings/search
parentf62af382665f7a8c6d4968a6cb15a0cfb638c505 (diff)
parent526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7 (diff)
downloadpackages_apps_Settings-0e64404a9445c3e073480681d22720240a70f2c1.zip
packages_apps_Settings-0e64404a9445c3e073480681d22720240a70f2c1.tar.gz
packages_apps_Settings-0e64404a9445c3e073480681d22720240a70f2c1.tar.bz2
am 526e4b41: am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev
* commit '526e4b41550fa70e08cfcfc7bfbc2aa88a9f71d7': Disable factory reset for secondary users
Diffstat (limited to 'src/com/android/settings/search')
-rw-r--r--src/com/android/settings/search/SearchIndexableResources.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 3051fd2..502480d 100644
--- 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));