summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TYM Tsai <tymtsai@google.com> 2025-01-13 21:11:21 +0800
committer TYM Tsai <tymtsai@google.com> 2025-01-13 21:11:21 +0800
commit523c3b5c51aad07c471183f72f37f83805a388ac (patch)
treef6cbddbb8a2ebaab5c973ed2983d0b06841cebf3
parentd708a2bbd13867482797ea2d2f524ca98749b780 (diff)
Fix setting reset with mult-user
There is a system API to reset settings to the default value, the API is user sensitive. But the user id is not used in the setting provider, it only reset setting for the system user. Uses the owning user ID instead to fix. Bug: 383309016 Bug: 383211851 FLAG: EXEMPT TEST Test: 1. create a new user 2. atest SettingsProviderTest Change-Id: I69a437620132c6ebcd6f38f0965af08ca0a2073c
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index f1f03c31f718..bfcb7c7cc187 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -1869,7 +1869,7 @@ public class SettingsProvider extends ContentProvider {
}
case MUTATION_OPERATION_RESET -> {
return mSettingsRegistry.resetSettingsLocked(SETTINGS_TYPE_SECURE,
- UserHandle.USER_SYSTEM, callingPackage, mode, tag);
+ owningUserId, callingPackage, mode, tag);
}
}
}