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

Commit 2481b2f8 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Move the BR_TRANSACTION_SEC_CTX debug string" into main am: 9c791c7c... 

Merge "Move the BR_TRANSACTION_SEC_CTX debug string" into main am: 9c791c7c am: a495ef9f am: 1f2c1c56

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



Change-Id: Icb1e65781bd0e002f736b55030593619245270ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c4cfa9c 1f2c1c56

libs/binder/IPCThreadState.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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[] = {