Merge changes Ib557fbea,I25bb743c,I99f2584c,I852e9427,Iecae9ca5 am: a69349e3ad am: 6e93925448 am: 27fc3bd27e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1695079

Change-Id: Ia0ce4a29b02277d74cf3f6d1127e818206b3e7c7

1 files changed, 23 insertions, 34 deletions

diff --git a/bta/include/bta_gatt_api.h b/bta/include/bta_gatt_api.h
index 8dfdca59f..2aabcdca7 100644
--- a/bta/include/bta_gatt_api.h
+++ b/bta/include/bta_gatt_api.h
@@ -70,44 +70,33 @@ typedef enum : uint8_t {
   BTA_GATTC_CONN_UPDATE_EVT = 26,   /* Connection parameters update event */
 } tBTA_GATTC_EVT;
 
-inline std::string GattClientEventText(tBTA_GATTC_EVT event) {
+#define CASE_RETURN_TEXT(code) \
+  case code:                   \
+    return #code
+
+inline std::string gatt_client_event_text(const tBTA_GATTC_EVT& event) {
   switch (event) {
-    case BTA_GATTC_DEREG_EVT:
-      return std::string("deregistered");
-    case BTA_GATTC_OPEN_EVT:
-      return std::string("opened");
-    case BTA_GATTC_CLOSE_EVT:
-      return std::string("closed");
-    case BTA_GATTC_SEARCH_CMPL_EVT:
-      return std::string("discovery completed");
-    case BTA_GATTC_SEARCH_RES_EVT:
-      return std::string("discovery result");
-    case BTA_GATTC_SRVC_DISC_DONE_EVT:
-      return std::string("discovery done");
-    case BTA_GATTC_NOTIF_EVT:
-      return std::string("attribute notification");
-    case BTA_GATTC_EXEC_EVT:
-      return std::string("execute write completed");
-    case BTA_GATTC_ACL_EVT:
-      return std::string("ACL up event");
-    case BTA_GATTC_CANCEL_OPEN_EVT:
-      return std::string("cancel open event");
-    case BTA_GATTC_SRVC_CHG_EVT:
-      return std::string("service changed");
-    case BTA_GATTC_ENC_CMPL_CB_EVT:
-      return std::string("encryption complete");
-    case BTA_GATTC_CFG_MTU_EVT:
-      return std::string("configure MTU complete");
-    case BTA_GATTC_CONGEST_EVT:
-      return std::string("congestion");
-    case BTA_GATTC_PHY_UPDATE_EVT:
-      return std::string("PHY change");
-    case BTA_GATTC_CONN_UPDATE_EVT:
-      return std::string("connection parameters update");
+    CASE_RETURN_TEXT(BTA_GATTC_DEREG_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_OPEN_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_CLOSE_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_SEARCH_CMPL_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_SEARCH_RES_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_SRVC_DISC_DONE_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_NOTIF_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_EXEC_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_ACL_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_CANCEL_OPEN_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_SRVC_CHG_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_ENC_CMPL_CB_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_CFG_MTU_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_CONGEST_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_PHY_UPDATE_EVT);
+    CASE_RETURN_TEXT(BTA_GATTC_CONN_UPDATE_EVT);
     default:
-      return std::string("unknown");
+      return std::string("UNKNOWN[%hhu]", event);
   }
 }
+#undef CASE_RETURN_TEXT
 
 typedef struct {
   uint16_t unit;  /* as UUIUD defined by SIG */