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

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

Merge "Tweak capabilities when auto tz detection is off"

parents 4c3ecce0 1586fd2d

services/core/java/com/android/server/timezonedetector/ConfigurationInternal.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public final class ConfigurationInternal { 
            configureGeolocationDetectionEnabledCapability = CAPABILITY_NOT_SUPPORTED;

        } else if (!allowConfigDateTime) {

            configureGeolocationDetectionEnabledCapability = CAPABILITY_NOT_ALLOWED;

        } else if (!isLocationEnabled()) {

        } else if (!mAutoDetectionEnabled || !isLocationEnabled()) {

            configureGeolocationDetectionEnabledCapability = CAPABILITY_NOT_APPLICABLE;

        } else {

            configureGeolocationDetectionEnabledCapability = CAPABILITY_POSSESSED;

services/tests/servicestests/src/com/android/server/timezonedetector/ConfigurationInternalTest.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class ConfigurationInternalTest { 
            TimeZoneCapabilities capabilities = capabilitiesAndConfig.getCapabilities();

            assertEquals(CAPABILITY_POSSESSED,

                    capabilities.getConfigureAutoDetectionEnabledCapability());

            assertEquals(CAPABILITY_POSSESSED,

            assertEquals(CAPABILITY_NOT_APPLICABLE,

                    capabilities.getConfigureGeoDetectionEnabledCapability());

            assertEquals(CAPABILITY_POSSESSED,

                    capabilities.getSuggestManualTimeZoneCapability());