Merge "GD: set advertiser id in_use in the lock" into tm-dev (30ff8b7f) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/le_advertising_manager.cc

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -62,6 +62,7 @@ struct Advertiser {
	bool started = false;		bool started = false;
	bool connectable = false;		bool connectable = false;
	bool directed = false;		bool directed = false;
			bool in_use = false;
	std::unique_ptr<os::Alarm> address_rotation_alarm;		std::unique_ptr<os::Alarm> address_rotation_alarm;
	};		};

	@@ -221,10 +222,11 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb
	while (id < num_instances_ && advertising_sets_.count(id) != 0) {		while (id < num_instances_ && advertising_sets_.count(id) != 0) {
	id++;		id++;
	}		}
	}
	if (id == num_instances_) {		if (id == num_instances_) {
	return kInvalidId;		return kInvalidId;
	}		}
			advertising_sets_[id].in_use = true;
			}
	return id;		return id;
	}		}