From 70512dd1d59a71dff5208761bff6539f5b2c17dd Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Thu, 3 Sep 2020 16:26:25 -0700 Subject: [PATCH] [backup] system_server should not call non forUser Settings.Secure.get* methods System server should not directly called Settings method such as Settings.Secure.getString() instead of Settings.Secure.getStringForUser(). The "ForUser" methods allow us to properly enforce the user's restrictions and it prevents issues like b/163571398. This CL is part of the effort that changes existing usage of non "ForUser" methods to using "ForUser" methods. It is supposed to act as a no-op. BUG: 166312046 Test: builds Change-Id: I632a243ec916a95437bcd32e5c480ab947eebb4e --- .../java/com/android/server/backup/BackupManagerConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backup/java/com/android/server/backup/BackupManagerConstants.java b/services/backup/java/com/android/server/backup/BackupManagerConstants.java index d8c5f6f804c89..4bd987a17447a 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerConstants.java +++ b/services/backup/java/com/android/server/backup/BackupManagerConstants.java @@ -112,7 +112,7 @@ public class BackupManagerConstants extends KeyValueSettingObserver { } public String getSettingValue(ContentResolver resolver) { - return Settings.Secure.getString(resolver, SETTING); + return Settings.Secure.getStringForUser(resolver, SETTING, resolver.getUserId()); } public synchronized void update(KeyValueListParser parser) {