From 76f00826a546d7cf3543c0bf760a4cd0910bc78c Mon Sep 17 00:00:00 2001 From: Abhishek Gadewar Date: Thu, 9 May 2024 17:02:18 -0700 Subject: Don't log error on success Summary: std::map::erase(Key&) returns 0 on failure (key did not exist), 1 on success (key existed and was deleted). Prior to this change, PersistableBundle would log an error anytime a key was successfully deleted. Test: added PersistableBundle test Change-Id: I9c2f6cabd30f784d5dbde5dee1f3d0eb2461bd06 Signed-off-by: Abhishek Gadewar --- libs/binder/PersistableBundle.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'libs/binder/PersistableBundle.cpp') diff --git a/libs/binder/PersistableBundle.cpp b/libs/binder/PersistableBundle.cpp index 15047152a1..5b157cc7c3 100644 --- a/libs/binder/PersistableBundle.cpp +++ b/libs/binder/PersistableBundle.cpp @@ -82,13 +82,12 @@ namespace os { } \ } -#define RETURN_IF_ENTRY_ERASED(map, key) \ - { \ - size_t num_erased = (map).erase(key); \ - if (num_erased) { \ - ALOGE("Failed at %s:%d (%s)", __FILE__, __LINE__, __func__); \ - return num_erased; \ - } \ +#define RETURN_IF_ENTRY_ERASED(map, key) \ + { \ + size_t num_erased = (map).erase(key); \ + if (num_erased) { \ + return num_erased; \ + } \ } status_t PersistableBundle::writeToParcel(Parcel* parcel) const { -- cgit v1.2.3-59-g8ed1b