am 565d20ef: Merge "metricsd: Enable https by default."

* commit '565d20ef0422fc3ed2f695306d84c14945ddd890':
  metricsd: Enable https by default.
This commit is contained in:
Bertrand Simonnet 2015-08-20 19:06:02 +00:00 committed by Android Git Automerger
commit 2888eec0bd

View file

@ -21,7 +21,7 @@ namespace metrics {
static const char kMetricsDirectory[] = "/data/misc/metrics/"; static const char kMetricsDirectory[] = "/data/misc/metrics/";
static const char kMetricsEventsFilePath[] = "/data/misc/metrics/uma-events"; static const char kMetricsEventsFilePath[] = "/data/misc/metrics/uma-events";
static const char kMetricsGUIDFilePath[] = "/data/misc/metrics/Sysinfo.GUID"; static const char kMetricsGUIDFilePath[] = "/data/misc/metrics/Sysinfo.GUID";
static const char kMetricsServer[] = "http://clients4.google.com/uma/v2"; static const char kMetricsServer[] = "https://clients4.google.com/uma/v2";
static const char kConsentFilePath[] = "/data/misc/metrics/enabled"; static const char kConsentFilePath[] = "/data/misc/metrics/enabled";
static const char kDefaultVersion[] = "0.0.0.0"; static const char kDefaultVersion[] = "0.0.0.0";
} // namespace metrics } // namespace metrics