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

Commit 19bf024e authored Jul 01, 2024 by Treehugger Robot Committed by Automerger Merge Worker Jul 01, 2024

Merge "Binder IPC: clean up includes" into main am: 79887b43 am: c6a06648

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

Change-Id: I658ac1e643a4b974ac115e2835fcc7d79d6740c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ecf9c1db c6a06648

cmds/servicemanager/NameUtil.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,8 +19,6 @@
	#include <string>		#include <string>
	#include <string_view>		#include <string_view>

	#include <android-base/strings.h>

	namespace android {		namespace android {

	#ifndef VENDORSERVICEMANAGER		#ifndef VENDORSERVICEMANAGER

libs/binder/IPCThreadState.cpp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,9 +22,7 @@
	#include <binder/BpBinder.h>		#include <binder/BpBinder.h>
	#include <binder/TextOutput.h>		#include <binder/TextOutput.h>

	#include <cutils/sched_policy.h>
	#include <utils/CallStack.h>		#include <utils/CallStack.h>
	#include <utils/Log.h>

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

libs/binder/IServiceManager.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@
	#include <android/os/IServiceManager.h>		#include <android/os/IServiceManager.h>
	#include <binder/IPCThreadState.h>		#include <binder/IPCThreadState.h>
	#include <binder/Parcel.h>		#include <binder/Parcel.h>
	#include <utils/Log.h>
	#include <utils/String8.h>		#include <utils/String8.h>

	#ifndef __ANDROID_VNDK__		#ifndef __ANDROID_VNDK__

libs/binder/IShellCallback.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@

	#include <binder/IShellCallback.h>		#include <binder/IShellCallback.h>

	#include <utils/Log.h>
	#include <binder/Parcel.h>		#include <binder/Parcel.h>
	#include <utils/String8.h>		#include <utils/String8.h>

libs/binder/LazyServiceRegistrar.cpp

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -14,15 +14,13 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	#include "log/log_main.h"
	#define LOG_TAG "AidlLazyServiceRegistrar"		#define LOG_TAG "AidlLazyServiceRegistrar"

	#include <binder/LazyServiceRegistrar.h>
	#include <binder/IPCThreadState.h>
	#include <binder/IServiceManager.h>
	#include <android/os/BnClientCallback.h>		#include <android/os/BnClientCallback.h>
	#include <android/os/IServiceManager.h>		#include <android/os/IServiceManager.h>
	#include <utils/Log.h>		#include <binder/IPCThreadState.h>
			#include <binder/IServiceManager.h>
			#include <binder/LazyServiceRegistrar.h>

	namespace android {		namespace android {
	namespace binder {		namespace binder {