Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[search] system_server should not call non forUser Settings.Secure.get* methods"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-10 17:26:23 +00:00
committed by Android (Google) Code Review
parent f6aa811630 38d819409c
commit 86fc502958
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/search/Searchables.java
View File

@@ -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());
}
/**