From 58029204baa037345a3528279c2a0127a3f0cf0f Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Fri, 15 Dec 2023 18:58:48 +0000 Subject: Move the BR_TRANSACTION_SEC_CTX debug string It will end up in the same index as BR_TRANSACTION because they are both defined as reply 2 with the only difference being the size of the structs which is stored in the lower 14 bits of the top 16 bits of the 32-bit structure. When we index into this array, we use only the bottom 8 bits with _IOC_NRBITS. See the definition in bionic/libc/kernel/uapi/linux/android/binder.h Test: m Bug: none Change-Id: Ie301d1fd89085dc69a2966b0f3ca349732133f8f --- libs/binder/IPCThreadState.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libs/binder/IPCThreadState.cpp') diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index f6ca26ec8d..b92e504a9a 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -70,7 +70,7 @@ namespace android { static const char* kReturnStrings[] = { "BR_ERROR", "BR_OK", - "BR_TRANSACTION", + "BR_TRANSACTION/BR_TRANSACTION_SEC_CTX", "BR_REPLY", "BR_ACQUIRE_RESULT", "BR_DEAD_REPLY", @@ -89,7 +89,6 @@ static const char* kReturnStrings[] = { "BR_FROZEN_REPLY", "BR_ONEWAY_SPAM_SUSPECT", "BR_TRANSACTION_PENDING_FROZEN", - "BR_TRANSACTION_SEC_CTX", }; static const char *kCommandStrings[] = { -- cgit v1.2.3-59-g8ed1b