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

Commit 60d03b27 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Id85ddcb6,I3b096848 am: 674d912e am: 4090b029 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2016760

Change-Id: I9913e72005c79bb9833bf8d999f7f4023446f448
parents 87946653 4090b029

libs/binder/BufferedTextOutput.h

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#define ANDROID_BUFFEREDTEXTOUTPUT_H



#include <binder/TextOutput.h>

#include <utils/threads.h>

#include <sys/uio.h>

#include <utils/Mutex.h>



// ---------------------------------------------------------------------------

namespace android {

libs/binder/IMemory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <log/log.h>



#include <utils/KeyedVector.h>

#include <utils/threads.h>

#include <utils/Mutex.h>



#define VERBOSE   0

libs/binder/IPCThreadState.cpp

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <utils/CallStack.h>

#include <utils/Log.h>

#include <utils/SystemClock.h>

#include <utils/threads.h>



#include <atomic>

#include <errno.h>

libs/binder/MemoryDealer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <utils/Log.h>

#include <utils/SortedVector.h>

#include <utils/String8.h>

#include <utils/threads.h>



#include <stdint.h>

#include <stdio.h>

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
// This macro should never be used at runtime, as a too large value

// of s could cause an integer overflow. Instead, you should always

// use the wrapper function pad_size()

#define PAD_SIZE_UNSAFE(s) (((s)+3)&~3)

#define PAD_SIZE_UNSAFE(s) (((s) + 3) & ~3UL)



static size_t pad_size(size_t s) {

    if (s > (std::numeric_limits<size_t>::max() - 3)) {