diff options
| author | 2023-12-18 17:19:37 +0000 | |
|---|---|---|
| committer | 2023-12-18 17:19:37 +0000 | |
| commit | 1f2c1c561ab7fdbe5f7805924d255d03d17fdd0c (patch) | |
| tree | 3846e7c42c7d7e5edc5d3693615fcd49252528f4 | |
| parent | cb629972f623904e26e45cee2af11b1ddb605274 (diff) | |
| parent | a495ef9f84bad76f89f9c80dda314776edb7427c (diff) | |
Merge "Move the BR_TRANSACTION_SEC_CTX debug string" into main am: 9c791c7c49 am: a495ef9f84
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2876688
Change-Id: I3916a8b00a5cab7e122b103dd205819c064e491c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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[] = { |