Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8942b34 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Module: Increase StopTimeout to 2000 ms am: 69ab62c8 am: 5731ebad 

Change-Id: I00e867f436b56ea9e479d559e21bc3fc9945bf4b
parents d7e2c110 5731ebad

system/gd/module.cc

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ using ::bluetooth::os::Thread; 


namespace bluetooth {



constexpr std::chrono::milliseconds kModuleStopTimeout = std::chrono::milliseconds(20);

constexpr std::chrono::milliseconds kModuleStopTimeout = std::chrono::milliseconds(2000);



ModuleFactory::ModuleFactory(std::function<Module*()> ctor) : ctor_(ctor) {

}

system/gd/module_unittest.cc

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ class TestModuleNoDependency : public Module { 


  void Stop() override {

    // A module is not considered stopped until after Stop() finishes

    test_module_no_dependency_handler = nullptr;

    EXPECT_TRUE(GetModuleRegistry()->IsStarted<TestModuleNoDependency>());

  }

};
@@ -88,7 +87,6 @@ class TestModuleOneDependency : public Module { 
  }



  void Stop() override {

    test_module_one_dependency_handler = GetHandler();

    EXPECT_TRUE(GetModuleRegistry()->IsStarted<TestModuleNoDependency>());



    // A module is not considered stopped until after Stop() finishes