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

Commit 3c6090ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: fix TimeDelta calls from older libchrome breaks CrOS build." am:... 

Merge "floss: fix TimeDelta calls from older libchrome breaks CrOS build." am: d6d4ef17 am: 055b3e69

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



Change-Id: I74d35be1c0da564d96b09d2454f1086494fc67e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56b2d78d 055b3e69

system/stack/eatt/eatt_impl.h

+6 −1
Original line number Diff line number Diff line
@@ -214,7 +214,12 @@ struct eatt_impl { 
          FROM_HERE,

          base::BindOnce(&eatt_impl::connect_eatt_wrap, base::Unretained(this),

                         std::move(eatt_dev)),

          base::TimeDelta::FromMilliseconds(500));

#if BASE_VER < 931007

          base::TimeDelta::FromMilliseconds(500)

#else

          base::Milliseconds(500)

#endif

      );



      LOG_INFO("Scheduled peripheral connect eatt for device with status: %d",

               (int)status);