Merge branch 'google3' up to cl/358291589.

2026-09-15 15:16:12 -04:00 · 2021-02-19 11:30:02 -08:00
parent 6be1ffc6d9 102f1e6fc3
commit b5e80417f4
1 changed files with 1 additions and 2 deletions
@@ -106,9 +106,8 @@ BluetoothDevice* BluetoothSocket::GetRemoteDevice() {

 std::unique_ptr<api::BluetoothSocket> BluetoothServerSocket::Accept() {
  absl::MutexLock lock(&mutex_);
-  while (pending_sockets_.empty()) {
+  while (!closed_ && pending_sockets_.empty()) {
    cond_.Wait(&mutex_);
-    if (closed_) break;
  }
  // whether or not we were running in the wait loop, return early if closed.
  if (closed_) return {};