Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restyle Work in Progress: Revert https://github.com/project-chip/connectedhomeip/commit/360252c… #13580

Closed
wants to merge 4 commits into from
Closed

Restyle Work in Progress: Revert https://github.com/project-chip/connectedhomeip/commit/360252c… #13580

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a9493a
Revert https://github.com/project-chip/connectedhomeip/commit/360252c…
selissia Jan 13, 2022
87a9d7a
Clean up formatting
selissia Jan 14, 2022
c6a2574
Merge branch 'master' of github.com:selissia/connectedhomeip into ota…
selissia Jan 14, 2022
b39e365
Restyled by clang-format
restyled-commits Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/app/server/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,12 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint
ChipLogProgress(AppServer, "Rendezvous and secure pairing skipped");
SuccessOrExit(err = AddTestCommissioning());
}
else if (GetFabricTable().FabricCount() != 0)
else if ((DeviceLayer::ConnectivityMgr().IsWiFiStationProvisioned() || DeviceLayer::ConnectivityMgr().IsThreadProvisioned()) &&
(GetFabricTable().FabricCount() != 0))
{
// The device is already commissioned, proactively disable BLE advertisement.
ChipLogProgress(AppServer, "Fabric already commissioned. Disabling BLE advertisement");
#if CONFIG_NETWORK_LAYER_BLE
chip::DeviceLayer::ConnectivityMgr().SetBLEAdvertisingEnabled(false);
#endif
}
else
{
Expand Down