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

Commit 7c6162cf authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge "Fix error checking logic -- "if it doesn't have a value"" into tm-dev... 

Merge "Fix error checking logic -- "if it doesn't have a value"" into tm-dev am: 55d4ad8d am: 313fbca5

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



Change-Id: Ie71f9bdae9c7db4de79fcb3450f6448557014142
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bea10963 313fbca5

system/btif/src/btif_dm.cc

+3 −3
Original line number Diff line number Diff line
@@ -2227,13 +2227,13 @@ void btif_dm_get_local_class_of_device(DEV_CLASS device_class) { 
  // Error check the inputs. Use the default if problems are found

  if (local_device_class.size() != 3) {

    LOG_ERROR("COD malformed, must have unsigned 3 integers.");

  } else if (local_device_class[0].has_value()

  } else if (!local_device_class[0].has_value()

      || local_device_class[0].value() > 0xFF) {

    LOG_ERROR("COD malformed, first value is missing or too large.");

  } else if (local_device_class[1].has_value()

  } else if (!local_device_class[1].has_value()

      || local_device_class[1].value() > 0xFF) {

    LOG_ERROR("COD malformed, second value is missing or too large.");

  } else if (local_device_class[2].has_value()

  } else if (!local_device_class[2].has_value()

      || local_device_class[2].value() > 0xFF) {

    LOG_ERROR("COD malformed, third value is missing or too large.");

  } else {