summaryrefslogtreecommitdiff
path: root/libs/binder/BpBinder.cpp
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2021-07-26 22:05:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-07-26 22:05:06 +0000
commit2cbcc54fd4814c5ba4e01a1f11d2d4f2fffc4911 (patch)
tree9b97a9e5188d195082119a0d3035939d88a93ab5 /libs/binder/BpBinder.cpp
parent5f58c863c9512e116a77504ec72671e2c19c6e9b (diff)
parent34d8b2ca5dbf6d313cabb2a50d3b70f413ea7bd3 (diff)
Merge "libbinder: remove per-binder wire protocol version" am: 4068ef232a am: 34d8b2ca5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1776767 Change-Id: I5698e61d542017fbbaba5d2ef6259c63ddc6d3d4
Diffstat (limited to 'libs/binder/BpBinder.cpp')
-rw-r--r--libs/binder/BpBinder.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp
index 3099296219..765e21cb38 100644
--- a/libs/binder/BpBinder.cpp
+++ b/libs/binder/BpBinder.cpp
@@ -261,15 +261,15 @@ status_t BpBinder::transact(
if (code >= FIRST_CALL_TRANSACTION && code <= LAST_CALL_TRANSACTION) {
using android::internal::Stability;
- auto category = Stability::getCategory(this);
+ int16_t stability = Stability::getRepr(this);
Stability::Level required = privateVendor ? Stability::VENDOR
: Stability::getLocalLevel();
- if (CC_UNLIKELY(!Stability::check(category, required))) {
+ if (CC_UNLIKELY(!Stability::check(stability, required))) {
ALOGE("Cannot do a user transaction on a %s binder (%s) in a %s context.",
- category.debugString().c_str(),
- String8(getInterfaceDescriptor()).c_str(),
- Stability::levelString(required).c_str());
+ Stability::levelString(stability).c_str(),
+ String8(getInterfaceDescriptor()).c_str(),
+ Stability::levelString(required).c_str());
return BAD_TYPE;
}
}