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

Commit 77e8fe62 authored by Neil Fuller's avatar Neil Fuller
Browse files

Disable geolocation time zone detection 

Time zone detection code was not referring to the "enable feature"
boolean for the upcoming geolocation time zone detection feature in some
necessary places, leading the time zone detector to conclude the feature
was enabled.

That meant devices would ignore telephony time zone suggestions, but
because geolocation isn't implemented fully yet, there were no
geo-based suggestions. This meant the device would just sit on its
existing time zone.

This change puts in the necessary checks.

Bug: 167904672
Test: build / boot / manually verify telephony info is being used
Change-Id: I7be2dbaa2afd1806b2ba248c3be3f9d5251650e1
parent 7febf914

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

+8 −5
Original line number Diff line number Diff line
@@ -117,12 +117,13 @@ public final class TimeZoneDetectorCallbackImpl implements TimeZoneDetectorStrat 


    @Override

    public ConfigurationInternal getConfigurationInternal(@UserIdInt int userId) {

        boolean geoDetectionEnabled = mGeoDetectionFeatureEnabled && isGeoDetectionEnabled(userId);

        return new ConfigurationInternal.Builder(userId)

                .setUserConfigAllowed(isUserConfigAllowed(userId))

                .setAutoDetectionSupported(isAutoDetectionSupported())

                .setAutoDetectionEnabled(isAutoDetectionEnabled())

                .setLocationEnabled(isLocationEnabled(userId))

                .setGeoDetectionEnabled(isGeoDetectionEnabled(userId))

                .setGeoDetectionEnabled(geoDetectionEnabled)

                .build();

    }
@@ -167,11 +168,13 @@ public final class TimeZoneDetectorCallbackImpl implements TimeZoneDetectorStrat 
            final boolean autoDetectionEnabled = configuration.isAutoDetectionEnabled();

            setAutoDetectionEnabled(autoDetectionEnabled);



            if (mGeoDetectionFeatureEnabled) {

                final int userId = configuration.getUserId();

                final boolean geoTzDetectionEnabled = configuration.isGeoDetectionEnabled();

                setGeoDetectionEnabled(userId, geoTzDetectionEnabled);

            }

        }

    }



    private boolean isUserConfigAllowed(@UserIdInt int userId) {

        UserHandle userHandle = UserHandle.of(userId);