openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "core: Update libchrome APIs to r395517" am: 51814a0142 am: 374b7aec14 am: 6ed783a72c 

am: d978d44918

* commit 'd978d44918c3fe90dc2bdd1276b3747484a1d247':
  core: Update libchrome APIs to r395517

Change-Id: I62987f3d4cbd7e2394601ce4299a33bc6877600d
This commit is contained in:
Luis Hector Chavez 2016-06-01 23:04:28 +00:00 committed by android-build-merger
parent 96cffc2d04 d978d44918
commit e68f363f32
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_
#define SYSTEM_CORE_LIBBINDERWRAPPER_REAL_BINDER_WRAPPER_H_
#include <map>
#include <base/macros.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 <memory>
#include "base/build_time.h"
#include "base/metrics/histogram_base.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_sum(snapshot.sum());
for (scoped_ptr<SampleCountIterator> it = snapshot.Iterator(); !it->Done();
for (std::unique_ptr<SampleCountIterator> it = snapshot.Iterator(); !it->Done();
it->Next()) {
HistogramBase::Sample min;
HistogramBase::Sample max;