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

Commit 4e9801f3 authored Mar 09, 2022 by Treehugger Robot Committed by Automerger Merge Worker Mar 09, 2022

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

Merge "Revert "libbinder: Replace deprecated utils/threads.h header"" am: 1caffe38 am: a8d37082 am: 490834e2 am: 2cceb1a3

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

Change-Id: I3c1520c206380cdad593024920f27522d542afe7

parents c5b40172 2cceb1a3

libs/binder/BufferedTextOutput.h

+1 −1

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

	#include <binder/TextOutput.h>		#include <binder/TextOutput.h>
			#include <utils/threads.h>
	#include <sys/uio.h>		#include <sys/uio.h>
	#include <utils/Mutex.h>

	// ---------------------------------------------------------------------------		// ---------------------------------------------------------------------------
	namespace android {		namespace android {

libs/binder/IMemory.cpp

+1 −1

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

	#include <utils/KeyedVector.h>		#include <utils/KeyedVector.h>
	#include <utils/Mutex.h>		#include <utils/threads.h>

	#define VERBOSE 0		#define VERBOSE 0

libs/binder/IPCThreadState.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@
	#include <utils/CallStack.h>		#include <utils/CallStack.h>
	#include <utils/Log.h>		#include <utils/Log.h>
	#include <utils/SystemClock.h>		#include <utils/SystemClock.h>
			#include <utils/threads.h>

	#include <atomic>		#include <atomic>
	#include <errno.h>		#include <errno.h>

libs/binder/MemoryDealer.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@
	#include <utils/Log.h>		#include <utils/Log.h>
	#include <utils/SortedVector.h>		#include <utils/SortedVector.h>
	#include <utils/String8.h>		#include <utils/String8.h>
			#include <utils/threads.h>

	#include <stdint.h>		#include <stdint.h>
	#include <stdio.h>		#include <stdio.h>

libs/binder/ProcessState.cpp

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,10 +25,9 @@
	#include <binder/IServiceManager.h>		#include <binder/IServiceManager.h>
	#include <binder/Stability.h>		#include <binder/Stability.h>
	#include <cutils/atomic.h>		#include <cutils/atomic.h>
	#include <utils/AndroidThreads.h>
	#include <utils/Log.h>		#include <utils/Log.h>
	#include <utils/String8.h>		#include <utils/String8.h>
	#include <utils/Thread.h>		#include <utils/threads.h>

	#include "Static.h"		#include "Static.h"
	#include "binder_module.h"		#include "binder_module.h"