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

Commit d804f238 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Binder: abstract report_sysprop_change to OS layer" into main am:... 

Merge "Binder: abstract report_sysprop_change to OS layer" into main am: 89710aa8 am: ec07e2cc am: 54605530

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



Change-Id: Ic6506a74fe91b4115645956ae4fdc8cbbb383347
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc5fa5af 54605530

libs/binder/Binder.cpp

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#endif



#include "BuildFlags.h"

#include "OS.h"

#include "RpcState.h"



namespace android {
@@ -795,7 +796,7 @@ status_t BBinder::onTransact( 
        }



        case SYSPROPS_TRANSACTION: {

            report_sysprop_change();

            if (!binder::os::report_sysprop_change()) return INVALID_OPERATION;

            return NO_ERROR;

        }

libs/binder/OS.h

+2 −0
Original line number Diff line number Diff line
@@ -43,4 +43,6 @@ ssize_t receiveMessageFromSocket( 


uint64_t GetThreadId();



bool report_sysprop_change();



} // namespace android::binder::os

libs/binder/OS_android.cpp

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "OS.h"



#include <android-base/threads.h>

#include <utils/misc.h>



namespace android::binder::os {
@@ -28,4 +29,9 @@ uint64_t GetThreadId() { 
#endif

}



bool report_sysprop_change() {

    android::report_sysprop_change();

    return true;

}



} // namespace android::binder::os

libs/binder/trusty/kernel/rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ MODULE_SRCS := \ 
	$(LIBBINDER_DIR)/FdTrigger.cpp \

	$(LIBBINDER_DIR)/IInterface.cpp \

	$(LIBBINDER_DIR)/IResultReceiver.cpp \

	$(LIBBINDER_DIR)/OS_android.cpp \

	$(LIBBINDER_DIR)/Parcel.cpp \

	$(LIBBINDER_DIR)/Stability.cpp \

	$(LIBBINDER_DIR)/Status.cpp \