ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "core: Update libchrome APIs to r395517"

Browse source 
am: 51814a0142

* commit '51814a0142f3d49d6bed42aa149898866db99153':
  core: Update libchrome APIs to r395517

Change-Id: Ib038b956891b61afb5af199e4ec5f5342a59802a
This commit is contained in:
Luis Hector Chavez 2016-06-01 21:58:03 +00:00 • committed by android-build-merger
commit 374b7aec14
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libbinderwrapper/real_binder_wrapper.h
View file

@ -17,6 +17,8 @@
#ifndef SYSTEM_CORE_LIBBINDERWRAPPER_REAL_BINDER_WRAPPER_H_ #ifndef SYSTEM_CORE_LIBBINDERWRAPPER_REAL_BINDER_WRAPPER_H_
#define SYSTEM_CORE_LIBBINDERWRAPPER_REAL_BINDER_WRAPPER_H_ #define SYSTEM_CORE_LIBBINDERWRAPPER_REAL_BINDER_WRAPPER_H_
#include <map>
#include <base/macros.h> #include <base/macros.h>
#include <binderwrapper/binder_wrapper.h> #include <binderwrapper/binder_wrapper.h>

4
metricsd/uploader/metrics_log_base.cc
View file

@ -16,6 +16,8 @@
#include "uploader/metrics_log_base.h" #include "uploader/metrics_log_base.h"
#include <memory>
#include "base/build_time.h" #include "base/build_time.h"
#include "base/metrics/histogram_base.h" #include "base/metrics/histogram_base.h"
#include "base/metrics/histogram_samples.h" #include "base/metrics/histogram_samples.h"
@ -125,7 +127,7 @@ void MetricsLogBase::RecordHistogramDelta(const std::string& histogram_name,
histogram_proto->set_name_hash(Hash(histogram_name)); histogram_proto->set_name_hash(Hash(histogram_name));
histogram_proto->set_sum(snapshot.sum()); histogram_proto->set_sum(snapshot.sum());
for (scoped_ptr<SampleCountIterator> it = snapshot.Iterator(); !it->Done(); for (std::unique_ptr<SampleCountIterator> it = snapshot.Iterator(); !it->Done();
it->Next()) { it->Next()) {
HistogramBase::Sample min; HistogramBase::Sample min;
HistogramBase::Sample max; HistogramBase::Sample max;