Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed1b905 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android (Google) Code Review
Browse files

Merge "Use requesting userId for ApplicationInfo lookup"

parents 27f8d6d9 7fe0a5ac

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -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);