From 93f62ab79a50d8f2f3d610e3d22a2ace835f8df6 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Mon, 12 Oct 2020 14:04:39 +0100 Subject: [PATCH] Modify the user default for "geotz enabled" This commit modifies the default for geolocation-based time zone detection from "whatever the user's location toggle is" to just always be off. This seems the most likely launch state as the current plan of record is to not opt-in upgrading users, and to explicitly set the setting in the SetUp Wizard for new users. Bug: 151304765 Test: Build / TH only Change-Id: Ifa5914b4d99708b54907259c50bd455897437225 --- .../server/timezonedetector/TimeZoneDetectorCallbackImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java index 964dbecf705c3..c4c862e7e6294 100644 --- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java +++ b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java @@ -199,10 +199,10 @@ public final class TimeZoneDetectorCallbackImpl implements TimeZoneDetectorStrat } private boolean isGeoDetectionEnabled(@UserIdInt int userId) { - final boolean locationEnabled = isLocationEnabled(userId); + final boolean geoDetectionEnabledByDefault = false; return Settings.Secure.getIntForUser(mCr, Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED, - locationEnabled ? 1 : 0 /* defaultValue */, userId) != 0; + (geoDetectionEnabledByDefault ? 1 : 0) /* defaultValue */, userId) != 0; } private void setGeoDetectionEnabled(@UserIdInt int userId, boolean enabled) {