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

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

Browse Source 
BUG: 166312046
Test: builds
Change-Id: I604ddbf311e5b8b350d1dbe9e1787cdad088de1e
This commit is contained in:
Songchun Fan
2020-09-03 16:21:03 -07:00
parent 8d7141513d
commit e83b7f2975
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/CoreSettingsObserver.java
View File

@@ -18,6 +18,7 @@ package com.android.server.am;
import android.annotation.NonNull;
import android.app.ActivityThread;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
@@ -223,16 +224,17 @@ final class CoreSettingsObserver extends ContentObserver {
@VisibleForTesting
void populateSettings(Bundle snapshot, Map<String, Class<?>> map) {
Context context = mActivityManagerService.mContext;
final Context context = mActivityManagerService.mContext;
final ContentResolver cr = context.getContentResolver();
for (Map.Entry<String, Class<?>> entry : map.entrySet()) {
String setting = entry.getKey();
final String value;
if (map == sSecureSettingToTypeMap) {
value = Settings.Secure.getString(context.getContentResolver(), setting);
value = Settings.Secure.getStringForUser(cr, setting, cr.getUserId());
} else if (map == sSystemSettingToTypeMap) {
value = Settings.System.getString(context.getContentResolver(), setting);
value = Settings.System.getStringForUser(cr, setting, cr.getUserId());
} else {
value = Settings.Global.getString(context.getContentResolver(), setting);
value = Settings.Global.getString(cr, setting);
}
if (value == null) {
snapshot.remove(setting);