diff options
| -rw-r--r-- | core/res/res/values/config.xml | 10 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f55114c94eed..0cfbf6d415b9 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1588,6 +1588,16 @@ config_enablePrimaryLocationTimeZoneOverlay is false. --> <string name="config_primaryLocationTimeZoneProviderPackageName" translatable="false">@null</string> + <!-- Whether to enable secondary location time zone provider overlay which allows the secondary + location time zone provider to be replaced by an app at run-time. When disabled, only the + config_secondaryLocationTimeZoneProviderPackageName package will be searched for the + secondary location time zone provider, otherwise any system package is eligible. Anyone who + wants to disable the overlay mechanism can set it to false. --> + <bool name="config_enableSecondaryLocationTimeZoneOverlay" translatable="false">false</bool> + <!-- Package name providing the secondary location time zone provider. Used only when + config_enableSecondaryLocationTimeZoneOverlay is false. --> + <string name="config_secondaryLocationTimeZoneProviderPackageName" translatable="false">@null</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 config_networkLocationProviderPackageName package will be searched for network location diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 3e595493d07d..54f6e8b27443 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2160,6 +2160,8 @@ <java-symbol type="string" name="config_deviceConfiguratorPackageName" /> <java-symbol type="bool" name="config_enablePrimaryLocationTimeZoneOverlay" /> <java-symbol type="string" name="config_primaryLocationTimeZoneProviderPackageName" /> + <java-symbol type="bool" name="config_enableSecondaryLocationTimeZoneOverlay" /> + <java-symbol type="string" name="config_secondaryLocationTimeZoneProviderPackageName" /> <java-symbol type="layout" name="resolver_list" /> <java-symbol type="id" name="resolver_list" /> diff --git a/services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java b/services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java index a8589d43116d..a817759c9783 100644 --- a/services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java +++ b/services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java @@ -198,9 +198,6 @@ public class LocationTimeZoneManagerService extends Binder { if (isInSimulationMode(SECONDARY_PROVIDER_NAME)) { proxy = new SimulatedLocationTimeZoneProviderProxy(mContext, mThreadingDomain); } else { - // TODO Uncomment this code in a later commit. - throw new UnsupportedOperationException("Not implemented"); - /* proxy = RealLocationTimeZoneProviderProxy.createAndRegister( mContext, mThreadingDomain, @@ -209,7 +206,6 @@ public class LocationTimeZoneManagerService extends Binder { com.android.internal.R.string .config_secondaryLocationTimeZoneProviderPackageName ); - */ } return createLocationTimeZoneProvider(SECONDARY_PROVIDER_NAME, proxy); } |