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

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

Merge "Revert "Revert "libbinder: Replace deprecated utils/threads.h header"""... 

Merge "Revert "Revert "libbinder: Replace deprecated utils/threads.h header""" am: 4fe07911 am: d6f49812 am: 1c3b787e

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

Change-Id: Icfcc6a3a9d763dc471772ef4d42eead10eab0742
parents cdbb0aea 1c3b787e

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
@@ -31,7 +31,7 @@ 
#include <binder/Parcel.h>

#include <log/log.h>



#include <utils/threads.h>

#include <utils/Mutex.h>



#include <map>

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/ProcessState.cpp

+2 −1
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ 
#include <binder/IServiceManager.h>

#include <binder/Stability.h>

#include <cutils/atomic.h>

#include <utils/AndroidThreads.h>

#include <utils/Log.h>

#include <utils/String8.h>

#include <utils/threads.h>

#include <utils/Thread.h>



#include "Static.h"

#include "binder_module.h"