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

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

Merge "BackendUnifiedServiceManager: tidy up includes" into main am: f020253e 

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



Change-Id: If73d2c39d8d0b9d0b46bd31b0d0dd6535110b89f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d15f6f3 f020253e

libs/binder/BackendUnifiedServiceManager.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,10 @@ 
 */

 */

#include "BackendUnifiedServiceManager.h"

#include "BackendUnifiedServiceManager.h"





#if defined(__BIONIC__) && !defined(__ANDROID_VNDK__)

#include <android-base/properties.h>

#endif



namespace android {

namespace android {





using AidlServiceManager = android::os::IServiceManager;

using AidlServiceManager = android::os::IServiceManager;

libs/binder/BackendUnifiedServiceManager.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

 */

#pragma once

#pragma once





#include <android-base/properties.h>

#include <android/os/BnServiceManager.h>

#include <android/os/BnServiceManager.h>

#include <android/os/IServiceManager.h>

#include <android/os/IServiceManager.h>

#include <binder/IPCThreadState.h>

#include <binder/IPCThreadState.h>

libs/binder/IServiceManager.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,8 +16,8 @@ 




#define LOG_TAG "ServiceManagerCppClient"

#define LOG_TAG "ServiceManagerCppClient"





#include <BackendUnifiedServiceManager.h>

#include <binder/IServiceManager.h>

#include <binder/IServiceManager.h>

#include "BackendUnifiedServiceManager.h"





#include <inttypes.h>

#include <inttypes.h>

#include <unistd.h>

#include <unistd.h>