From a6a06b04e2f7463710ee0cb1776f3d9cf2aa5d71 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Mon, 17 May 2021 11:13:25 +0100
Subject: [PATCH] Tidy configuration associated with geotz

Tidy configuration associated with geolocation time zone detection.

This commit contains a number of documentation fixes.

It also is part of a topic that moves the configuration of the secondary
location time zone provider to a Google-specific overlay.

Note: There will be a follow up later in the release cycle to remove the
hosting of the secondary LTZP in the system server.

Bug: 178169250
Bug: 174027180
Test: treehugger
Change-Id: Icb56bb78e06fe6ac30fd5671208994aebcff29b8
---
 core/res/res/values/config.xml | 43 ++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index aa0d23bf33852..e90f87d0a22f6 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1653,29 +1653,38 @@
     <integer name="config_timeZoneRulesCheckRetryCount">5</integer>
 
     <!-- Whether the geolocation time zone detection feature is enabled. Setting this to false means
-         the feature cannot be used. Setting this to true means it may be used if other
-         configuration allows (see provider configuration below, also compile time overlays). -->
+         the feature cannot be used. Setting this to true means system server components can be
+         tested and location time zone detection may be used if other configuration allows (see
+         location time zone provider configuration settings below). -->
     <bool name="config_enableGeolocationTimeZoneDetection" translatable="false">true</bool>
 
-    <!-- Whether the primary LocationTimeZoneProvider is enabled.
-         Ignored if config_enableGeolocationTimeZoneDetection is false -->
+    <!-- Whether the primary location time zone provider is enabled.
+         This setting is ignored if config_enableGeolocationTimeZoneDetection is false.
+
+         AOSP does not configure a primary location time zone provider. -->
     <bool name="config_enablePrimaryLocationTimeZoneProvider" translatable="false">false</bool>
-    <!-- The package name providing the primary location time zone provider.
+
+    <!-- The package hosting the primary location time zone provider.
          Only used when config_enableGeolocationTimeZoneDetection and
-         enablePrimaryLocationTimeZoneProvider are true. -->
-    <string name="config_primaryLocationTimeZoneProviderPackageName" translatable="false">@null</string>
+         config_enablePrimaryLocationTimeZoneProvider are true.
 
-    <!-- Whether the secondary LocationTimeZoneProvider is enabled.
-         Ignored if config_enableGeolocationTimeZoneDetection is false -->
-    <bool name="config_enableSecondaryLocationTimeZoneProvider" translatable="false">true</bool>
-    <!-- Package name providing the secondary location time zone provider. Used only when
-         config_enableSecondaryLocationTimeZoneOverlay is false.
+         See android.service.timezone.TimeZoneProviderService for how to host location time zone
+         provider services. -->
+    <string name="config_primaryLocationTimeZoneProviderPackageName" translatable="false"></string>
 
-         By default, set to "android" to pick up the default LocationTimeZoneProvider configured in
-         the system server's AndroidManifest.xml. See the
-         com.android.location.timezone.service.v1.SecondaryLocationTimeZoneProvider intent-filter
-         definition there for more information. -->
-    <string name="config_secondaryLocationTimeZoneProviderPackageName" translatable="false">android</string>
+    <!-- Whether the secondary location time zone provider is enabled.
+         This setting is ignored if config_enableGeolocationTimeZoneDetection is false.
+
+         AOSP does not configure a secondary location time zone provider. -->
+    <bool name="config_enableSecondaryLocationTimeZoneProvider" translatable="false">false</bool>
+
+    <!-- The package hosting the secondary location time zone provider.
+         Only used when config_enableGeolocationTimeZoneDetection and
+         config_enableSecondaryLocationTimeZoneProvider are true.
+
+         See android.service.timezone.TimeZoneProviderService for how to host location time zone
+         provider services. -->
+    <string name="config_secondaryLocationTimeZoneProviderPackageName" translatable="false"></string>
 
     <!-- Whether to enable network location overlay which allows network location provider to be
          replaced by an app at run-time. When disabled, only the