diff options
-rw-r--r-- | location/java/android/location/flags/location.aconfig | 10 | ||||
-rw-r--r-- | services/core/java/com/android/server/location/gnss/NetworkTimeHelper.java | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/location/java/android/location/flags/location.aconfig b/location/java/android/location/flags/location.aconfig index dcf5c5b46478..23d65c7adf49 100644 --- a/location/java/android/location/flags/location.aconfig +++ b/location/java/android/location/flags/location.aconfig @@ -94,6 +94,16 @@ flag { } flag { + name: "use_legacy_ntp_time" + namespace: "location" + description: "Flag for switching to legacy NtpNetworkTimeHelper" + bug: "368034558" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "subscriptions_changed_listener_thread" namespace: "location" description: "Flag for running onSubscriptionsChangedListener on FgThread" diff --git a/services/core/java/com/android/server/location/gnss/NetworkTimeHelper.java b/services/core/java/com/android/server/location/gnss/NetworkTimeHelper.java index 01c108bd5067..494ea7714ff9 100644 --- a/services/core/java/com/android/server/location/gnss/NetworkTimeHelper.java +++ b/services/core/java/com/android/server/location/gnss/NetworkTimeHelper.java @@ -19,6 +19,7 @@ import android.annotation.CurrentTimeMillisLong; import android.annotation.ElapsedRealtimeLong; import android.annotation.NonNull; import android.content.Context; +import android.location.flags.Flags; import android.os.Looper; import java.io.PrintWriter; @@ -55,7 +56,7 @@ abstract class NetworkTimeHelper { static NetworkTimeHelper create( @NonNull Context context, @NonNull Looper looper, @NonNull InjectTimeCallback injectTimeCallback) { - if (USE_TIME_DETECTOR_IMPL) { + if (!Flags.useLegacyNtpTime()) { TimeDetectorNetworkTimeHelper.Environment environment = new TimeDetectorNetworkTimeHelper.EnvironmentImpl(looper); return new TimeDetectorNetworkTimeHelper(environment, injectTimeCallback); |