diff options
| author | 2023-10-09 17:02:46 +0000 | |
|---|---|---|
| committer | 2023-10-17 23:04:20 +0000 | |
| commit | 346f104bd866baeace03cc87a9329f315698291e (patch) | |
| tree | b01819053299c270f066b8afede3452d28ff33e1 | |
| parent | 3f4c4957a69f60df33fffb56a07edcfe523a13d4 (diff) | |
Binder: abstract report_sysprop_change to OS layer
Bug: 302723053
Test: mma
Change-Id: Ia479cbf435eeba108cf21e6adddf2d1034174019
| -rw-r--r-- | libs/binder/Binder.cpp | 3 | ||||
| -rw-r--r-- | libs/binder/OS.h | 2 | ||||
| -rw-r--r-- | libs/binder/OS_android.cpp | 6 | ||||
| -rw-r--r-- | libs/binder/trusty/kernel/rules.mk | 1 |
4 files changed, 11 insertions, 1 deletions
diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index 9f091ef756..f22e90a03f 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -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; } diff --git a/libs/binder/OS.h b/libs/binder/OS.h index db4b7a5379..8dc1f6ae70 100644 --- a/libs/binder/OS.h +++ b/libs/binder/OS.h @@ -43,4 +43,6 @@ ssize_t receiveMessageFromSocket( uint64_t GetThreadId(); +bool report_sysprop_change(); + } // namespace android::binder::os diff --git a/libs/binder/OS_android.cpp b/libs/binder/OS_android.cpp index 1e1442b7c0..ad458eb705 100644 --- a/libs/binder/OS_android.cpp +++ b/libs/binder/OS_android.cpp @@ -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 diff --git a/libs/binder/trusty/kernel/rules.mk b/libs/binder/trusty/kernel/rules.mk index f6e894c064..1f05ef757a 100644 --- a/libs/binder/trusty/kernel/rules.mk +++ b/libs/binder/trusty/kernel/rules.mk @@ -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 \ |