Merge "Add a system property for geotz"

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

@@ -30,6 +30,7 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ResultReceiver;
 import android.os.ShellCallback;
+import android.os.SystemProperties;
 import android.util.ArrayMap;
 import android.util.IndentingPrintWriter;
 import android.util.Slog;
@@ -58,11 +59,14 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub
     private static final String TAG = "TimeZoneDetectorService";
 
     /**
-     * A compile time constant "feature switch" for enabling / disabling location-based time zone
-     * detection on Android. If this is {@code false}, there should be few / little changes in
-     * behavior with previous releases and little overhead associated with geolocation components.
+     * A "feature switch" for enabling / disabling location-based time zone detection. If this is
+     * {@code false}, there should be few / little changes in behavior with previous releases and
+     * little overhead associated with geolocation components.
+     * TODO(b/151304765) Remove this when the feature is on for all.
      */
-    public static final boolean GEOLOCATION_TIME_ZONE_DETECTION_ENABLED = false;
+    public static final boolean GEOLOCATION_TIME_ZONE_DETECTION_ENABLED =
+            SystemProperties.getBoolean(
+                    "persist.sys.location_time_zone_detection_feature_enabled", false);
 
     /**
      * Handles the service lifecycle for {@link TimeZoneDetectorService} and