From d8d25e00386dd768a59e38eb3e1ae0cec0e797b2 Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Fri, 20 Nov 2015 13:09:26 -0800 Subject: Use resolved calling user id bug:25476216 Change-Id: I0093a5c071affaa5f3ca8eeb0e3a7a36b66a3c1f --- .../src/com/android/providers/settings/SettingsProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 8b1caf9411ee..3971706b02d8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -904,12 +904,12 @@ public class SettingsProvider extends ContentProvider { } } - // Enforce what the calling package can mutate the system settings. - enforceRestrictedSystemSettingsMutationForCallingPackage(operation, name, runAsUserId); - // Resolve the userId on whose behalf the call is made. final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(runAsUserId); + // Enforce what the calling package can mutate the system settings. + enforceRestrictedSystemSettingsMutationForCallingPackage(operation, name, callingUserId); + // Determine the owning user as some profile settings are cloned from the parent. final int owningUserId = resolveOwningUserIdForSystemSettingLocked(callingUserId, name); -- cgit v1.2.3-59-g8ed1b