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

Commit a4e84758 authored by Hang Lu's avatar Hang Lu Committed by Connor O'Brien
Browse files

UPSTREAM: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings 



Add BR_FROZEN_REPLY in binder_return_strings to support stat function.

Fixes: ae28c1be1e54 ("binder: BINDER_GET_FROZEN_INFO ioctl")
Acked-by: default avatarTodd Kjos <tkjos@google.com>
Signed-off-by: default avatarHang Lu <hangl@codeaurora.org>
Link: https://lore.kernel.org/r/1617961246-4502-2-git-send-email-hangl@codeaurora.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 005169157448ca41eff8716d79dc1b8f158229d2)
Bug: 187129171
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
Change-Id: I3b0f67ee9f3a747d9052b7a900f2239b0e4097f5
parent 013b7ed7

drivers/android/binder.c

+2 −1
Original line number Diff line number Diff line
@@ -5743,7 +5743,8 @@ static const char * const binder_return_strings[] = { 
	"BR_FINISHED",

	"BR_DEAD_BINDER",

	"BR_CLEAR_DEATH_NOTIFICATION_DONE",

	"BR_FAILED_REPLY"

	"BR_FAILED_REPLY",

	"BR_FROZEN_REPLY",

};



static const char * const binder_command_strings[] = {

drivers/android/binder_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ enum binder_stat_types { 
};



struct binder_stats {

	atomic_t br[_IOC_NR(BR_FAILED_REPLY) + 1];

	atomic_t br[_IOC_NR(BR_FROZEN_REPLY) + 1];

	atomic_t bc[_IOC_NR(BC_REPLY_SG) + 1];

	atomic_t obj_created[BINDER_STAT_COUNT];

	atomic_t obj_deleted[BINDER_STAT_COUNT];