Skip to content

Commit 0c386f2

Browse files
hai007copybara-github
authored andcommitted
Automated Code Change
PiperOrigin-RevId: 876027287
1 parent e5046f6 commit 0c386f2

File tree

1 file changed

+8
-28
lines changed
  • connections/implementation/mediums

1 file changed

+8
-28
lines changed

connections/implementation/mediums/ble.cc

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,7 @@ Ble::~Ble() {
110110
alarm_executor_.Shutdown();
111111
accept_loops_runner_.Shutdown();
112112

113-
if (NearbyFlags::GetInstance().GetBoolFlag(
114-
config_package_nearby::nearby_connections_feature::
115-
kEnableAdvertisingForInstantOnLost)) {
116-
instant_on_lost_manager_.Shutdown();
117-
}
113+
instant_on_lost_manager_.Shutdown();
118114
}
119115

120116
bool Ble::IsAvailable() const {
@@ -275,11 +271,7 @@ bool Ble::StopAdvertising(const std::string& service_id) {
275271
StopAdvertisementGattServerLocked();
276272
}
277273

278-
if (NearbyFlags::GetInstance().GetBoolFlag(
279-
config_package_nearby::nearby_connections_feature::
280-
kEnableAdvertisingForInstantOnLost)) {
281-
instant_on_lost_manager_.OnAdvertisingStopped(service_id);
282-
}
274+
instant_on_lost_manager_.OnAdvertisingStopped(service_id);
283275

284276
return true;
285277
}
@@ -1485,12 +1477,8 @@ bool Ble::StartFastAdvertisingLocked(
14851477
return false;
14861478
}
14871479

1488-
if (NearbyFlags::GetInstance().GetBoolFlag(
1489-
config_package_nearby::nearby_connections_feature::
1490-
kEnableAdvertisingForInstantOnLost)) {
1491-
instant_on_lost_manager_.OnAdvertisingStarted(service_id,
1492-
medium_advertisement_bytes);
1493-
}
1480+
instant_on_lost_manager_.OnAdvertisingStarted(service_id,
1481+
medium_advertisement_bytes);
14941482

14951483
return true;
14961484
}
@@ -1521,12 +1509,8 @@ bool Ble::StartRegularAdvertisingLocked(
15211509
"advertisement bytes="
15221510
<< absl::BytesToHexString(medium_advertisement_bytes.data());
15231511
} else {
1524-
if (NearbyFlags::GetInstance().GetBoolFlag(
1525-
config_package_nearby::nearby_connections_feature::
1526-
kEnableAdvertisingForInstantOnLost)) {
1527-
instant_on_lost_manager_.OnAdvertisingStarted(
1528-
service_id, medium_advertisement_bytes);
1529-
}
1512+
instant_on_lost_manager_.OnAdvertisingStarted(service_id,
1513+
medium_advertisement_bytes);
15301514
}
15311515
}
15321516

@@ -1607,12 +1591,8 @@ bool Ble::StartGattAdvertisingLocked(
16071591
return false;
16081592
}
16091593

1610-
if (NearbyFlags::GetInstance().GetBoolFlag(
1611-
config_package_nearby::nearby_connections_feature::
1612-
kEnableAdvertisingForInstantOnLost)) {
1613-
instant_on_lost_manager_.OnAdvertisingStarted(service_id,
1614-
medium_advertisement_bytes);
1615-
}
1594+
instant_on_lost_manager_.OnAdvertisingStarted(service_id,
1595+
medium_advertisement_bytes);
16161596

16171597
return true;
16181598
}

0 commit comments

Comments
 (0)