Merge branch 'master' into release

Change-Id: I6e5c45cffa1cae932ca1e7294f3b6ef1be26b8ee
This commit is contained in:
Alexey Polyudov
2020-06-04 13:04:42 -07:00
29 changed files with 2042 additions and 20 deletions
@@ -84,9 +84,13 @@ class BluetoothAdapter : public api::BluetoothAdapter {
BluetoothDevice& GetDevice() { return device_; }
void SetMedium(api::BluetoothClassicMedium* medium);
api::BluetoothClassicMedium* GetMedium() { return medium_; }
private:
mutable absl::Mutex mutex_;
BluetoothDevice device_{this};
api::BluetoothClassicMedium* medium_ = nullptr;
ScanMode mode_ ABSL_GUARDED_BY(mutex_) = ScanMode::kNone;
std::string name_ ABSL_GUARDED_BY(mutex_) = "unknown G3 BT device";
bool enabled_ ABSL_GUARDED_BY(mutex_) = false;