Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ed783a7 authored by Luis Hector Chavez's avatar Luis Hector Chavez Committed by android-build-merger
Browse files

Merge "core: Update libchrome APIs to r395517" am: 51814a01 

am: 374b7aec

* commit '374b7aec':
  core: Update libchrome APIs to r395517

Change-Id: Ib51007e95caeea1d62adf752b9541e40d4bc925f
parents 823d5bbc 374b7aec

libbinderwrapper/real_binder_wrapper.h

+2 −0
Original line number Diff line number Diff line
@@ -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>

metricsd/uploader/metrics_log_base.cc

+3 −1
Original line number Diff line number Diff line
@@ -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;