// The registered IBluetoothLeAdvertiser handle. If |ble_advertiser_registering|
// is true then an operation to register the advertiser is in progress.
+const int invalid_advertiser_id = -1;
std::atomic_bool ble_advertiser_registering(false);
-std::atomic_int ble_advertiser_id(0);
+std::atomic_int ble_advertiser_id(invalid_advertiser_id);
// The registered IBluetoothLeScanner handle. If |ble_scanner_registering| is
// true then an operation to register the scanner is in progress.
return;
}
- if (ble_advertiser_id.load()) {
+ if (ble_advertiser_id.load() != invalid_advertiser_id) {
PrintError("Already registered");
return;
}
const vector<string>& args) {
CHECK_NO_ARGS(args);
- if (!ble_advertiser_id.load()) {
+ if (ble_advertiser_id.load() == invalid_advertiser_id) {
PrintError("Not registered");
return;
}
}
ble_advertiser_iface->UnregisterAdvertiser(ble_advertiser_id.load());
- ble_advertiser_id = 0;
+ ble_advertiser_id = invalid_advertiser_id;
PrintCommandStatus(true);
}
}
}
- if (!ble_advertiser_id.load()) {
+ if (ble_advertiser_id.load() == invalid_advertiser_id) {
PrintError("BLE advertiser not registered");
return;
}
}
void HandleStopAdv(IBluetooth* bt_iface, const vector<string>& args) {
- if (!ble_advertiser_id.load()) {
+ if (ble_advertiser_id.load() == invalid_advertiser_id) {
PrintError("BLE advertiser not registered");
return;
}
std::lock_guard<std::mutex> lock(maps_lock_);
int instance_id = instance->GetInstanceId();
- CHECK(instance_id);
if (!id_to_cb_.Register(instance_id, callback, this)) {
LOG(ERROR) << "Failed to store callback";
OnRegisterInstanceImpl(bluetooth::BLE_STATUS_FAILURE, callback, nullptr);