From 9d141d63d19df600bb746d8c974d1865ad9e260f Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 9 Apr 2021 15:57:23 +0100 Subject: [PATCH] Return initialization defaults to original values Sets the initialization timeout values back to longer times. They were reduced because the GMS core / online provider was swallowing requests by default and timeout was "normal". The GMS core provider is now implemented. Bug: 179488561 Bug: 172899605 Test: Build only Change-Id: Ib743343d83c716cd228dbfa97962cb941f5a9b0d --- .../server/timezonedetector/ServiceConfigAccessor.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/timezonedetector/ServiceConfigAccessor.java b/services/core/java/com/android/server/timezonedetector/ServiceConfigAccessor.java index 4a1d9c40a11cf..23f6bbe481723 100644 --- a/services/core/java/com/android/server/timezonedetector/ServiceConfigAccessor.java +++ b/services/core/java/com/android/server/timezonedetector/ServiceConfigAccessor.java @@ -86,11 +86,9 @@ public final class ServiceConfigAccessor { ServerFlags.KEY_LOCATION_TIME_ZONE_DETECTION_UNCERTAINTY_DELAY_MILLIS })); - // TODO(b/179488561): Put this back to 5 minutes when primary provider is fully implemented - private static final Duration DEFAULT_PROVIDER_INITIALIZATION_TIMEOUT = Duration.ofMinutes(1); - // TODO(b/179488561): Put this back to 1 minute when primary provider is fully implemented + private static final Duration DEFAULT_PROVIDER_INITIALIZATION_TIMEOUT = Duration.ofMinutes(5); private static final Duration DEFAULT_PROVIDER_INITIALIZATION_TIMEOUT_FUZZ = - Duration.ofSeconds(20); + Duration.ofMinutes(1); private static final Duration DEFAULT_PROVIDER_UNCERTAINTY_DELAY = Duration.ofMinutes(5); private static final Object SLOCK = new Object();