From 7fe0a5ac562d6063b6562ccc5fc5877da9a86e17 Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Sat, 18 Feb 2017 11:41:26 -0800 Subject: [PATCH] Use requesting userId for ApplicationInfo lookup Change-Id: I4f29f31e48d66d16181fb415fd864de2746def94 Fixes: 34771610 Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java --- .../src/com/android/providers/settings/SettingsProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index ba657e963f3f9..9cf060c5fffcd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1037,7 +1037,7 @@ public class SettingsProvider extends ContentProvider { final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId); // Ensure the caller can access the setting. - enforceSettingReadable(name, SETTINGS_TYPE_SECURE, callingUserId); + enforceSettingReadable(name, SETTINGS_TYPE_SECURE, UserHandle.getCallingUserId()); // Determine the owning user as some profile settings are cloned from the parent. final int owningUserId = resolveOwningUserIdForSecureSettingLocked(callingUserId, name); @@ -1233,7 +1233,7 @@ public class SettingsProvider extends ContentProvider { final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId); // Ensure the caller can access the setting. - enforceSettingReadable(name, SETTINGS_TYPE_SYSTEM, callingUserId); + enforceSettingReadable(name, SETTINGS_TYPE_SYSTEM, UserHandle.getCallingUserId()); // Determine the owning user as some profile settings are cloned from the parent. final int owningUserId = resolveOwningUserIdForSystemSettingLocked(callingUserId, name);