Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "enable_background_geodetection_metrics", "enhanced_droidfood_metrics"

Browse Source 
* changes:
  Add field to record state of background geotz
  Add fields for "enhanced metrics collection"
This commit is contained in:
Neil Fuller
2022-01-14 18:29:07 +00:00
committed by Android (Google) Code Review
parent 8161eee7af 9d569d3222
commit bac5d5c638
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -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);