From 38d819409cbd18119aaf2d5633c464892547e1aa Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Thu, 3 Sep 2020 15:41:29 -0700 Subject: [PATCH] [search] system_server should not call non forUser Settings.Secure.get* methods BUG: 166312046 Test: builds Change-Id: I287fc166a35b5876a86fb4caaaee91d77f2c3d2e --- .../core/java/com/android/server/search/Searchables.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/search/Searchables.java b/services/core/java/com/android/server/search/Searchables.java index 8af76a17f0843..c769a50ec8900 100644 --- a/services/core/java/com/android/server/search/Searchables.java +++ b/services/core/java/com/android/server/search/Searchables.java @@ -20,6 +20,7 @@ import android.app.AppGlobals; import android.app.SearchManager; import android.app.SearchableInfo; import android.content.ComponentName; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -397,8 +398,9 @@ public class Searchables { } private String getGlobalSearchProviderSetting() { - return Settings.Secure.getString(mContext.getContentResolver(), - Settings.Secure.SEARCH_GLOBAL_SEARCH_ACTIVITY); + final ContentResolver cr = mContext.getContentResolver(); + return Settings.Secure.getStringForUser(cr, + Settings.Secure.SEARCH_GLOBAL_SEARCH_ACTIVITY, cr.getUserId()); } /**