From f39d5f3da26c4dc5d502681d7748cbf126d1cec3 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 17 May 2024 15:05:30 +0000 Subject: Fix potential issue with multi-user/multi-screen use case The code assumes the caller is the current user. It may not be in future. Flag: EXEMPT bugfix Bug: 341649491 Change-Id: Idaba55537783abc9be39743bffd8d5f93e2b314c --- .../java/com/android/server/timedetector/ServiceConfigAccessorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/timedetector/ServiceConfigAccessorImpl.java b/services/core/java/com/android/server/timedetector/ServiceConfigAccessorImpl.java index ad2c3e83b041..3579246b660f 100644 --- a/services/core/java/com/android/server/timedetector/ServiceConfigAccessorImpl.java +++ b/services/core/java/com/android/server/timedetector/ServiceConfigAccessorImpl.java @@ -225,7 +225,7 @@ final class ServiceConfigAccessorImpl implements ServiceConfigAccessor { @NonNull TimeConfiguration requestedConfiguration, boolean bypassUserPolicyChecks) { Objects.requireNonNull(requestedConfiguration); - TimeCapabilitiesAndConfig capabilitiesAndConfig = getCurrentUserConfigurationInternal() + TimeCapabilitiesAndConfig capabilitiesAndConfig = getConfigurationInternal(userId) .createCapabilitiesAndConfig(bypassUserPolicyChecks); TimeCapabilities capabilities = capabilitiesAndConfig.getCapabilities(); TimeConfiguration oldConfiguration = capabilitiesAndConfig.getConfiguration(); -- cgit v1.2.3-59-g8ed1b