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

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

Browse Source 
BUG: 166312046
Test: builds
Change-Id: I287fc166a35b5876a86fb4caaaee91d77f2c3d2e
This commit is contained in:
Songchun Fan
2020-09-03 15:41:29 -07:00
parent 4743509c7e
commit 38d819409c
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());
}
/**