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

Commit 9a7382d0 authored by Henri Chataing's avatar Henri Chataing
Browse files

system/stack/eatt: Migrate to libbluetooth_log 

Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, mechanical refactor
Change-Id: I60617a1445cff06b6da6cf9b36becd8330a8ea78
parent 024c4b1d

system/stack/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -1454,6 +1454,7 @@ cc_test { 
        "libcutils",

        "libcutils",

    ],

    ],

    static_libs: [

    static_libs: [

        "libbase",

        "libbluetooth-types",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbluetooth_gd",

        "libbluetooth_log",

        "libbluetooth_log",

system/stack/eatt/eatt.cc

+4 −4
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#include <base/logging.h>

#include <bluetooth/log.h>





#include "eatt_impl.h"

#include "eatt_impl.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_hdr.h"
@@ -33,7 +33,7 @@ struct EattExtension::impl { 




  void Start() {

  void Start() {

    if (eatt_impl_) {

    if (eatt_impl_) {

      LOG(ERROR) << "Eatt already started";

      log::error("Eatt already started");

      return;

      return;

    };

    };
@@ -48,7 +48,7 @@ struct EattExtension::impl { 
    reg_info_.pL2CA_CreditBasedCollisionInd_Cb = eatt_collision_ind;

    reg_info_.pL2CA_CreditBasedCollisionInd_Cb = eatt_collision_ind;





    if (L2CA_RegisterLECoc(BT_PSM_EATT, reg_info_, BTM_SEC_NONE, {}) == 0) {

    if (L2CA_RegisterLECoc(BT_PSM_EATT, reg_info_, BTM_SEC_NONE, {}) == 0) {

      LOG(ERROR) << __func__ << " cannot register EATT";

      log::error("cannot register EATT");

    } else {

    } else {

      eatt_impl_ = std::make_unique<eatt_impl>();

      eatt_impl_ = std::make_unique<eatt_impl>();

    }

    }
@@ -56,7 +56,7 @@ struct EattExtension::impl { 




  void Stop() {

  void Stop() {

    if (!eatt_impl_) {

    if (!eatt_impl_) {

      LOG(ERROR) << "Eatt not started";

      log::error("Eatt not started");

      return;

      return;

    }

    }

    eatt_impl_.reset(nullptr);

    eatt_impl_.reset(nullptr);

system/stack/eatt/eatt_impl.h

+118 −123

File changed.

Preview size limit exceeded, changes collapsed.