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

Commit b444f988 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Remove unused GATT status code GATT_MORE" into main am: bada1e46 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2907785



Change-Id: I24180b7e87de826acaa3fe0a163d47c130c78387
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09c95346 bada1e46

system/stack/include/gatt_api.h

+0 −2
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ typedef enum GattStatus : uint8_t { 
  GATT_CMD_STARTED = 0x86,

  GATT_PENDING = 0x88,

  GATT_AUTH_FAIL = 0x89,

  GATT_MORE = 0x8a,

  GATT_INVALID_CFG = 0x8b,

  GATT_SERVICE_STARTED = 0x8c,

  GATT_ENCRYPED_MITM = GATT_SUCCESS,
@@ -125,7 +124,6 @@ inline std::string gatt_status_text(const tGATT_STATUS& status) { 
    CASE_RETURN_TEXT(GATT_CMD_STARTED);

    CASE_RETURN_TEXT(GATT_PENDING);

    CASE_RETURN_TEXT(GATT_AUTH_FAIL);

    CASE_RETURN_TEXT(GATT_MORE);

    CASE_RETURN_TEXT(GATT_INVALID_CFG);

    CASE_RETURN_TEXT(GATT_SERVICE_STARTED);

    CASE_RETURN_TEXT(GATT_ENCRYPED_NO_MITM);

system/stack/test/gatt/stack_gatt_test.cc

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ TEST_F(StackGattTest, gatt_status_text) { 
      std::make_pair(GATT_CMD_STARTED, "GATT_CMD_STARTED"),

      std::make_pair(GATT_PENDING, "GATT_PENDING"),

      std::make_pair(GATT_AUTH_FAIL, "GATT_AUTH_FAIL"),

      std::make_pair(GATT_MORE, "GATT_MORE"),

      std::make_pair(GATT_INVALID_CFG, "GATT_INVALID_CFG"),

      std::make_pair(GATT_SERVICE_STARTED, "GATT_SERVICE_STARTED"),

      std::make_pair(GATT_ENCRYPED_NO_MITM, "GATT_ENCRYPED_NO_MITM"),