diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java index 07a584913b0bc..16176f0265787 100644 --- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java +++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java @@ -3436,7 +3436,10 @@ public class StatsPullAtomService extends SystemService { metricsState.getLatestTelephonySuggestion()), convertTimeZoneSuggestionToProtoBytes( metricsState.getLatestGeolocationSuggestion()), - metricsState.isTelephonyTimeZoneFallbackSupported() + metricsState.isTelephonyTimeZoneFallbackSupported(), + metricsState.getDeviceTimeZoneId(), + metricsState.isEnhancedMetricsCollectionEnabled(), + metricsState.getGeoDetectionRunInBackgroundEnabled() )); } catch (RuntimeException e) { Slog.e(TAG, "Getting time zone detection state failed: ", e); @@ -3483,6 +3486,14 @@ public class StatsPullAtomService extends SystemService { android.app.time.MetricsTimeZoneSuggestion.TIME_ZONE_ORDINALS, zoneIdOrdinal); } + String[] zoneIds = suggestion.getZoneIds(); + if (zoneIds != null) { + for (String zoneId : zoneIds) { + protoOutputStream.write( + android.app.time.MetricsTimeZoneSuggestion.TIME_ZONE_IDS, + zoneId); + } + } } protoOutputStream.flush(); closeQuietly(byteArrayOutputStream);