From 3777eba3b1dc4d691d8d23d3f963da56a95c2253 Mon Sep 17 00:00:00 2001 From: gaoyx9 Date: Wed, 6 Apr 2022 17:32:17 +0800 Subject: [PATCH] Revert "UPSTREAM: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings" This reverts commit a4e84758f02959df24c67e0aabcefd42079c2d01. Change-Id: Ibe3b8e21f0d42086816e0cd18b08e42457414b1c Reviewed-on: https://gerrit.mot.com/2235002 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: Lianlu Chen Reviewed-by: Xiaojun Ji --- drivers/android/binder.c | 3 +-- drivers/android/binder_internal.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 6e82ec9bdd69..5c9b17e41fc2 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -5969,8 +5969,7 @@ static const char * const binder_return_strings[] = { "BR_FINISHED", "BR_DEAD_BINDER", "BR_CLEAR_DEATH_NOTIFICATION_DONE", - "BR_FAILED_REPLY", - "BR_FROZEN_REPLY", + "BR_FAILED_REPLY" }; static const char * const binder_command_strings[] = { diff --git a/drivers/android/binder_internal.h b/drivers/android/binder_internal.h index 8af81a24b83d..68f4d7b5e7f3 100644 --- a/drivers/android/binder_internal.h +++ b/drivers/android/binder_internal.h @@ -155,7 +155,7 @@ enum binder_stat_types { }; struct binder_stats { - atomic_t br[_IOC_NR(BR_FROZEN_REPLY) + 1]; + atomic_t br[_IOC_NR(BR_FAILED_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];