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

Commit 2133060a authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Fix potential issue with multi-user/multi-screen use case" into main

parents 45aaef93 f39d5f3d

services/core/java/com/android/server/timedetector/ServiceConfigAccessorImpl.java

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