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

Merge "[SettingsProvider] fix the removing of old keys"

Browse Source
This commit is contained in:
Songchun Fan
2020-12-02 18:40:12 +00:00
committed by Android (Google) Code Review
parent 8837606ba6 82a0b97883
commit 842d0d95f6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
View File

@@ -496,11 +496,14 @@ final class SettingsState {
public List<String> setSettingsLocked(String prefix, Map<String, String> keyValues,
String packageName) {
List<String> changedKeys = new ArrayList<>();
final Iterator<Map.Entry<String, Setting>> iterator = mSettings.entrySet().iterator();
// Delete old keys with the prefix that are not part of the new set.
for (int i = 0; i < mSettings.keySet().size(); ++i) {
String key = mSettings.keyAt(i);
if (key.startsWith(prefix) && !keyValues.containsKey(key)) {
Setting oldState = mSettings.remove(key);
while (iterator.hasNext()) {
Map.Entry<String, Setting> entry = iterator.next();
final String key = entry.getKey();
final Setting oldState = entry.getValue();
if (key != null && key.startsWith(prefix) && !keyValues.containsKey(key)) {
iterator.remove();
FrameworkStatsLog.write(FrameworkStatsLog.SETTING_CHANGED, key,
/* value= */ "", /* newValue= */ "", oldState.value, /* tag */ "", false,