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

Commit 1586fd2d authored Oct 08, 2020 by Neil Fuller

Tweak capabilities when auto tz detection is off

Tweak user capabilities when automatic tz detection is off.

The capability to alter "geo detection enabled" can be "not applicable"
as it doesn't matter what the "geo detection enabled" setting is if
automatic detection is off.

Bug: 152746236
Test: atest services/tests/servicestests/src/com/android/server/timezonedetector/ConfigurationInternalTest.java
Change-Id: Ie8594cd1b96841421571bf6bdf43fa56b5e31d73

parent e7741e18

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());